Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc92a296 authored by Roy Chou's avatar Roy Chou
Browse files

chore(magnification): cleanup flag usage of... 

chore(magnification): cleanup flag usage of hide_magnification_always_on_toggle_when_window_mode_only

The bug-fix flag is already soaking in trunkfood full stage for a while.
Since there is no coming issues related to the fix, we can apply the fix
and remove the flag usage.

Bug: 341203230
Flag: NONE
Test: manually
      atest MagnificationAlwaysOnPreferenceControllerTest
Change-Id: I7e6ef8e03e7b7291d2faa15351669a91a50f59a5
parent 2b7c9e5c

src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java

+2 −13
Original line number Diff line number Diff line
@@ -67,17 +67,13 @@ public class MagnificationAlwaysOnPreferenceController extends 


    @Override

    public void onResume() {

        if (Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) {

        MagnificationCapabilities.registerObserver(mContext, mContentObserver);

    }

    }



    @Override

    public void onPause() {

        if (Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) {

        MagnificationCapabilities.unregisterObserver(mContext, mContentObserver);

    }

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {
@@ -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;

tests/robotests/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceControllerTest.java

+3 −21
Original line number Diff line number Diff line
@@ -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);