Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev am: 55d7d938bb am: dfbb68eb56

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001651

Change-Id: If8db0cc90a9a12cfff52adb3f9359108cf393c6c

src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java

@@ -17,17 +17,30 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.net.Uri;
+
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.widget.SettingsMainSwitchPreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.widget.MainSwitchPreference;
 
 /**
  * The controller to handle one-handed mode main switch enable or disable state.
  **/
 public class OneHandedMainSwitchPreferenceController extends
-        SettingsMainSwitchPreferenceController {
+        SettingsMainSwitchPreferenceController implements OneHandedSettingsUtils.TogglesCallback,
+        LifecycleObserver, OnStart, OnStop {
+
+    private final OneHandedSettingsUtils mUtils;
+
+    private MainSwitchPreference mPreference;
 
     public OneHandedMainSwitchPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
+        mUtils = new OneHandedSettingsUtils(context);
     }
 
     @Override
@@ -53,4 +66,30 @@ public class OneHandedMainSwitchPreferenceController extends
         OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, isChecked);
         return true;
     }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onStart() {
+        mUtils.registerToggleAwareObserver(this);
+    }
+
+    @Override
+    public void onStop() {
+        mUtils.unregisterToggleAwareObserver();
+    }
+
+    @Override
+    public void onChange(Uri uri) {
+        if (mPreference == null) {
+            return;
+        }
+        if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)) {
+            mPreference.setChecked(isChecked());
+        }
+    }
 }

tests/robotests/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceControllerTest.java

@@ -56,6 +56,15 @@ public class OneHandedMainSwitchPreferenceControllerTest {
         assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isTrue();
     }
 
+    @Test
+    public void isChecked_setOneHandedModeEnabled_shouldReturnTrue() {
+        SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
+        mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
+        OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
     @Test
     public void getAvailabilityStatus_setSupportOneHandedModeProperty_shouldAvailable() {
         SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");