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

Merge "Revert "Fix Java 8 un-compilable code.""

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-09 07:39:47 +00:00
committed by Android (Google) Code Review
parent 4c39f69131 caa04b6303
commit 92c97579fb
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -228,7 +228,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
return; return;
} }
SwitchPreference alwaysOnPreference = new SwitchPreference(getPrefContext()); var alwaysOnPreference = new SwitchPreference(getPrefContext());
alwaysOnPreference.setTitle( alwaysOnPreference.setTitle(
R.string.accessibility_screen_magnification_always_on_title); R.string.accessibility_screen_magnification_always_on_title);
alwaysOnPreference.setSummary( alwaysOnPreference.setSummary(
@@ -237,9 +237,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
MagnificationAlwaysOnPreferenceController.PREF_KEY); MagnificationAlwaysOnPreferenceController.PREF_KEY);
generalCategory.addPreference(alwaysOnPreference); generalCategory.addPreference(alwaysOnPreference);
MagnificationAlwaysOnPreferenceController alwaysOnPreferenceController = var alwaysOnPreferenceController = new MagnificationAlwaysOnPreferenceController(
new MagnificationAlwaysOnPreferenceController( getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);
getContext(), MagnificationAlwaysOnPreferenceController.PREF_KEY);
getSettingsLifecycle().addObserver(alwaysOnPreferenceController); getSettingsLifecycle().addObserver(alwaysOnPreferenceController);
alwaysOnPreferenceController.displayPreference(getPreferenceScreen()); alwaysOnPreferenceController.displayPreference(getPreferenceScreen());
addPreferenceController(alwaysOnPreferenceController); addPreferenceController(alwaysOnPreferenceController);
@@ -348,7 +347,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
AccessibilitySettingsContentObserver contentObserver) { AccessibilitySettingsContentObserver contentObserver) {
super.registerKeysToObserverCallback(contentObserver); super.registerKeysToObserverCallback(contentObserver);
List<String> keysToObserve = List.of( var keysToObserve = List.of(
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED
); );