From 9e890a93f897644edf6017e1dc1d763aa1752b03 Mon Sep 17 00:00:00 2001
From: Riley Jones <jonesriley@google.com>
Date: Tue, 14 Jan 2025 01:27:45 +0000
Subject: [PATCH] Cleanup qs shortcut flag in OneHandedSettingsUtils

Test: atest OneHandedSettingsUtilsTest
Bug: 367414968
Flag: EXEMPT flag cleanup
Change-Id: Ic906bd025ea9df7c5b083899608be4e1324ae317
---
 .../gestures/OneHandedSettingsUtils.java        | 14 ++++----------
 .../gestures/OneHandedSettingsUtilsTest.java    | 17 -----------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/com/android/settings/gestures/OneHandedSettingsUtils.java b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
index fe7db4f7c3e..cba40bd0302 100644
--- a/src/com/android/settings/gestures/OneHandedSettingsUtils.java
+++ b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
@@ -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;
+        // Checks QS_SHORTCUT_KEY
+        final String targetsQs = Settings.Secure.getStringForUser(context.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_QS_TARGETS, sCurrentUserId);
+        return !TextUtils.isEmpty(targetsQs) && targetsQs.contains(ONE_HANDED_MODE_TARGET_NAME);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
index ee5f72ed2d4..ab1682a192f 100644
--- a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
@@ -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);