diff options
| author | JosJuice <josjuice@gmail.com> | 2023-02-27 22:04:42 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2023-03-02 18:25:10 +0100 |
| commit | 96deb2d8971fd5c9d0644bc0fae9155334c76153 (patch) | |
| tree | 6745f065d17d17edb8d0b29d1950237448d96dab /Source/Android/app/src/main/res | |
| parent | b827b155a0ac3c29c2f916fd6f3c39f2b54defbc (diff) | |
Android: Hide controller mappings button when controller type is None
Also removed the make_sure_continuous_scan_enabled message.
It doesn't make sense with the new UX.
Diffstat (limited to 'Source/Android/app/src/main/res')
3 files changed, 8 insertions, 9 deletions
diff --git a/Source/Android/app/src/main/res/layout-ldrtl/list_item_setting.xml b/Source/Android/app/src/main/res/layout-ldrtl/list_item_setting.xml index 8e923c4bd8..eb2ac6c617 100644 --- a/Source/Android/app/src/main/res/layout-ldrtl/list_item_setting.xml +++ b/Source/Android/app/src/main/res/layout-ldrtl/list_item_setting.xml @@ -8,15 +8,13 @@ android:background="?android:attr/selectableItemBackground" android:clickable="true" android:focusable="true" - android:minHeight="72dp" android:nextFocusLeft="@id/button_more_settings"> <TextView android:id="@+id/text_setting_name" style="@style/TextAppearance.MaterialComponents.Headline5" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:layout_marginEnd="@dimen/spacing_large" @@ -24,11 +22,12 @@ android:layout_marginTop="@dimen/spacing_large" android:textSize="16sp" android:textAlignment="viewStart" + android:layout_toStartOf="@+id/button_more_settings" tools:text="Setting Name" /> <TextView android:id="@+id/text_setting_description" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_alignStart="@+id/text_setting_name" @@ -37,6 +36,7 @@ android:layout_marginEnd="@dimen/spacing_large" android:layout_marginStart="@dimen/spacing_large" android:layout_marginTop="@dimen/spacing_small" + android:layout_toStartOf="@+id/button_more_settings" android:textAlignment="viewStart" tools:text="@string/overclock_enable_description" /> diff --git a/Source/Android/app/src/main/res/layout/list_item_setting.xml b/Source/Android/app/src/main/res/layout/list_item_setting.xml index 93c4f2d6d3..e0bae52bef 100644 --- a/Source/Android/app/src/main/res/layout/list_item_setting.xml +++ b/Source/Android/app/src/main/res/layout/list_item_setting.xml @@ -8,15 +8,13 @@ android:background="?android:attr/selectableItemBackground" android:clickable="true" android:focusable="true" - android:minHeight="72dp" android:nextFocusRight="@id/button_more_settings"> <TextView android:id="@+id/text_setting_name" style="@style/TextAppearance.MaterialComponents.Headline5" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:layout_marginEnd="@dimen/spacing_large" @@ -24,11 +22,12 @@ android:layout_marginTop="@dimen/spacing_large" android:textSize="16sp" android:textAlignment="viewStart" + android:layout_toStartOf="@+id/button_more_settings" tools:text="Setting Name" /> <TextView android:id="@+id/text_setting_description" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_alignStart="@+id/text_setting_name" @@ -37,6 +36,7 @@ android:layout_marginEnd="@dimen/spacing_large" android:layout_marginStart="@dimen/spacing_large" android:layout_marginTop="@dimen/spacing_small" + android:layout_toStartOf="@+id/button_more_settings" android:textAlignment="viewStart" tools:text="@string/overclock_enable_description" /> diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index a89032e7e6..e81092cbb9 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -683,7 +683,6 @@ It can efficiently compress both junk data and encrypted Wii data. <string name="replug_gc_adapter">GameCube Adapter couldn\'t be opened. Please re-plug the device.</string> <string name="disabled_gc_overlay_notice">GameCube Controller 1 is set to \"None\"</string> <string name="ignore_warning_alert_messages">Ignore for this session</string> - <string name="make_sure_continuous_scan_enabled">Please make sure Continuous Scanning is enabled in Core Settings.</string> <!-- UI CPU Core selection --> <string name="jit_recompiler_x86">JIT Recompiler for x86–64 (recommended)</string> |