diff --git a/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java b/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java index 43d11b0148d..ff271c1e016 100644 --- a/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java @@ -67,16 +67,12 @@ public class MagnificationAlwaysOnPreferenceController extends @Override public void onResume() { - if (Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) { - MagnificationCapabilities.registerObserver(mContext, mContentObserver); - } + MagnificationCapabilities.registerObserver(mContext, mContentObserver); } @Override public void onPause() { - if (Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) { - MagnificationCapabilities.unregisterObserver(mContext, mContentObserver); - } + MagnificationCapabilities.unregisterObserver(mContext, mContentObserver); } @Override @@ -111,10 +107,6 @@ public class MagnificationAlwaysOnPreferenceController extends @Override public CharSequence getSummary() { - if (!Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) { - return super.getSummary(); - } - @StringRes int resId = mPreference.isEnabled() ? R.string.accessibility_screen_magnification_always_on_summary : R.string.accessibility_screen_magnification_always_on_unavailable_summary; @@ -124,9 +116,6 @@ public class MagnificationAlwaysOnPreferenceController extends @Override public void updateState(Preference preference) { super.updateState(preference); - if (!Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) { - return; - } if (preference == null) { return; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceControllerTest.java index f0decabccee..64b16fa5d66 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceControllerTest.java @@ -28,9 +28,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.content.Context; -import android.platform.test.annotations.DisableFlags; -import android.platform.test.annotations.EnableFlags; -import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import androidx.preference.PreferenceManager; @@ -39,7 +36,6 @@ import androidx.preference.SwitchPreference; import androidx.test.core.app.ApplicationProvider; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -49,8 +45,6 @@ import org.robolectric.shadows.ShadowContentResolver; @RunWith(RobolectricTestRunner.class) public class MagnificationAlwaysOnPreferenceControllerTest { - @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); - private static final String KEY_ALWAYS_ON = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED; @@ -99,8 +93,7 @@ public class MagnificationAlwaysOnPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_HIDE_MAGNIFICATION_ALWAYS_ON_TOGGLE_WHEN_WINDOW_MODE_ONLY) - public void onResume_flagOn_verifyRegisterCapabilityObserver() { + public void onResume_verifyRegisterCapabilityObserver() { mController.onResume(); assertThat(mShadowContentResolver.getContentObservers( Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY))) @@ -108,8 +101,7 @@ public class MagnificationAlwaysOnPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_HIDE_MAGNIFICATION_ALWAYS_ON_TOGGLE_WHEN_WINDOW_MODE_ONLY) - public void onPause_flagOn_verifyUnregisterCapabilityObserver() { + public void onPause_verifyUnregisterCapabilityObserver() { mController.onResume(); mController.onPause(); assertThat(mShadowContentResolver.getContentObservers( @@ -118,17 +110,7 @@ public class MagnificationAlwaysOnPreferenceControllerTest { } @Test - @DisableFlags(Flags.FLAG_HIDE_MAGNIFICATION_ALWAYS_ON_TOGGLE_WHEN_WINDOW_MODE_ONLY) - public void updateState_windowModeOnlyAndFlagOff_preferenceIsAvailable() { - MagnificationCapabilities.setCapabilities(mContext, MagnificationMode.WINDOW); - - mController.updateState(mSwitchPreference); - assertThat(mSwitchPreference.isEnabled()).isTrue(); - } - - @Test - @EnableFlags(Flags.FLAG_HIDE_MAGNIFICATION_ALWAYS_ON_TOGGLE_WHEN_WINDOW_MODE_ONLY) - public void updateState_windowModeOnlyAndFlagOn_preferenceBecomesUnavailable() { + public void updateState_windowModeOnly_preferenceBecomesUnavailable() { MagnificationCapabilities.setCapabilities(mContext, MagnificationMode.WINDOW); mController.updateState(mSwitchPreference);