PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "chore(magnification): cleanup flag usage of hide_magnification_always_on_toggle_when_window_mode_only" into main

Browse Source
This commit is contained in:
Roy Chou
2024-05-22 00:56:13 +00:00
committed by Android (Google) Code Review
parent 0f84065b9d dc92a296b5
commit bc0758fa54
2 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceController.java
View File

@@ -67,16 +67,12 @@ public class MagnificationAlwaysOnPreferenceController extends
@Override @Override
public void onResume() { public void onResume() {
if (Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) { MagnificationCapabilities.registerObserver(mContext, mContentObserver);
MagnificationCapabilities.registerObserver(mContext, mContentObserver);
}
} }
@Override @Override
public void onPause() { public void onPause() {
if (Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) { MagnificationCapabilities.unregisterObserver(mContext, mContentObserver);
MagnificationCapabilities.unregisterObserver(mContext, mContentObserver);
}
} }
@Override @Override
@@ -111,10 +107,6 @@ public class MagnificationAlwaysOnPreferenceController extends
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
if (!Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) {
return super.getSummary();
}
@StringRes int resId = mPreference.isEnabled() @StringRes int resId = mPreference.isEnabled()
? R.string.accessibility_screen_magnification_always_on_summary ? R.string.accessibility_screen_magnification_always_on_summary
: R.string.accessibility_screen_magnification_always_on_unavailable_summary; : R.string.accessibility_screen_magnification_always_on_unavailable_summary;
@@ -124,9 +116,6 @@ public class MagnificationAlwaysOnPreferenceController extends
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
if (!Flags.hideMagnificationAlwaysOnToggleWhenWindowModeOnly()) {
return;
}
if (preference == null) { if (preference == null) {
return; return;

24
tests/robotests/src/com/android/settings/accessibility/MagnificationAlwaysOnPreferenceControllerTest.java
View File

@@ -28,9 +28,6 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.content.Context; 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 android.provider.Settings;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@@ -39,7 +36,6 @@ import androidx.preference.SwitchPreference;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -49,8 +45,6 @@ import org.robolectric.shadows.ShadowContentResolver;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class MagnificationAlwaysOnPreferenceControllerTest { public class MagnificationAlwaysOnPreferenceControllerTest {
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String KEY_ALWAYS_ON = private static final String KEY_ALWAYS_ON =
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED; Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED;
@@ -99,8 +93,7 @@ public class MagnificationAlwaysOnPreferenceControllerTest {
} }
@Test @Test
@EnableFlags(Flags.FLAG_HIDE_MAGNIFICATION_ALWAYS_ON_TOGGLE_WHEN_WINDOW_MODE_ONLY) public void onResume_verifyRegisterCapabilityObserver() {
public void onResume_flagOn_verifyRegisterCapabilityObserver() {
mController.onResume(); mController.onResume();
assertThat(mShadowContentResolver.getContentObservers( assertThat(mShadowContentResolver.getContentObservers(
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY))) Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY)))
@@ -108,8 +101,7 @@ public class MagnificationAlwaysOnPreferenceControllerTest {
} }
@Test @Test
@EnableFlags(Flags.FLAG_HIDE_MAGNIFICATION_ALWAYS_ON_TOGGLE_WHEN_WINDOW_MODE_ONLY) public void onPause_verifyUnregisterCapabilityObserver() {
public void onPause_flagOn_verifyUnregisterCapabilityObserver() {
mController.onResume(); mController.onResume();
mController.onPause(); mController.onPause();
assertThat(mShadowContentResolver.getContentObservers( assertThat(mShadowContentResolver.getContentObservers(
@@ -118,17 +110,7 @@ public class MagnificationAlwaysOnPreferenceControllerTest {
} }
@Test @Test
@DisableFlags(Flags.FLAG_HIDE_MAGNIFICATION_ALWAYS_ON_TOGGLE_WHEN_WINDOW_MODE_ONLY) public void updateState_windowModeOnly_preferenceBecomesUnavailable() {
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() {
MagnificationCapabilities.setCapabilities(mContext, MagnificationMode.WINDOW); MagnificationCapabilities.setCapabilities(mContext, MagnificationMode.WINDOW);
mController.updateState(mSwitchPreference); mController.updateState(mSwitchPreference);