Merge "Cleanup qs shortcut flag in OneHandedSettingsUtils" into main (e5649f2c) · Commits · e / os / android_packages_apps_Settings

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

+4 −10

Original line number	Diff line number	Diff line
		@@ -257,16 +257,10 @@ public class OneHandedSettingsUtils {
		return true;
		}

		if (android.view.accessibility.Flags.a11yQsShortcut()) {
		// Checks QS_SHORTCUT_KEY
		final String targetsQs = Settings.Secure.getStringForUser(context.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_QS_TARGETS, sCurrentUserId);
		if (!TextUtils.isEmpty(targetsQs) && targetsQs.contains(ONE_HANDED_MODE_TARGET_NAME)) {
		return true;
		}
		}

		return false;
		return !TextUtils.isEmpty(targetsQs) && targetsQs.contains(ONE_HANDED_MODE_TARGET_NAME);
		}

		/**

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -22,14 +22,9 @@ import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;
		import android.os.UserHandle;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.provider.Settings;
		import android.view.accessibility.Flags;

		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;
		@@ -37,8 +32,6 @@ import org.robolectric.RuntimeEnvironment;

		@RunWith(RobolectricTestRunner.class)
		public class OneHandedSettingsUtilsTest {
		@Rule
		public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
		private static final int OFF = 0;
		private static final int ON = 1;

		@@ -162,7 +155,6 @@ public class OneHandedSettingsUtilsTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
		public void getShortcutEnabled_qsShortcutEnabled_returnTrue() {
		setupShortcuts(
		/* enableFab= / false, / enableVolumeKeys= / false, / enableQs=*/ true);
		@@ -170,15 +162,6 @@ public class OneHandedSettingsUtilsTest {
		assertThat(OneHandedSettingsUtils.getShortcutEnabled(mContext)).isTrue();
		}

		@Test
		@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
		public void getShortcutEnabled_flagDisabled_qsShortcutEnabled_returnFalse() {
		setupShortcuts(
		/* enableFab= / false, / enableVolumeKeys= / false, / enableQs=*/ true);

		assertThat(OneHandedSettingsUtils.getShortcutEnabled(mContext)).isFalse();
		}

		private void setupShortcuts(boolean enableFab, boolean enableVolumeKeys, boolean enableQs) {
		setupShortcut(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, enableFab);
		setupShortcut(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, enableVolumeKeys);