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
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;