Merge pull request #11369 from t895/switch-fix

Android: Allow users to interact with switches in settings
dolphin-emu · Dec 24, 2022 · b3bc9c4 · b3bc9c4
2 parents 54a6c4a + cf85375
commit b3bc9c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...va/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SwitchSettingViewHolder.java b/...va/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SwitchSettingViewHolder.java
@@ -33,6 +33,15 @@ public void bind(SettingsItem item)
 
     mBinding.settingSwitch.setChecked(mItem.isChecked(getAdapter().getSettings()));
 
+    mBinding.settingSwitch.setEnabled(mItem.isEditable());
+
+    mBinding.settingSwitch.setOnCheckedChangeListener((buttonView, isChecked) ->
+    {
+      getAdapter().onBooleanClick(mItem, mBinding.settingSwitch.isChecked());
+
+      setStyle(mBinding.textSettingName, mItem);
+    });
+
     setStyle(mBinding.textSettingName, mItem);
   }
 
@@ -46,10 +55,6 @@ public void onClick(View clicked)
     }
 
     mBinding.settingSwitch.toggle();
-
-    getAdapter().onBooleanClick(mItem, mBinding.settingSwitch.isChecked());
-
-    setStyle(mBinding.textSettingName, mItem);
   }
 
   @Nullable @Override

diff --git a/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml b/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml
@@ -44,7 +44,6 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="24dp"
-        android:clickable="false"
         android:focusable="false"
         android:minHeight="0dp"
         android:minWidth="0dp" />