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

Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d am: f37eaffefc am: aaf5e96718

Browse Source 
Change-Id: I24e5a98e21353250b54e56ef3fe4dd62928b3b5e
This commit is contained in:
TreeHugger Robot
2020-05-13 06:12:47 +00:00
committed by Automerger Merge Worker
parent 313cf0159d aaf5e96718
commit 3068fefc41
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -472,8 +472,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
showDialog(DialogEnums.MAGNIFICATION_EDIT_SHORTCUT);
}
@Override
protected void updateShortcutPreferenceData() {
private void updateShortcutPreferenceData() {
// Get the user shortcut type from settings provider.
mUserShortcutType = getUserShortcutTypeFromSettings(getPrefContext());
if (mUserShortcutType != UserShortcutType.EMPTY) {
@@ -495,8 +494,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
mShortcutPreference.setTitle(title);
}
@Override
protected void updateShortcutPreference() {
private void updateShortcutPreference() {
final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
mShortcutPreference.setChecked(
hasMagnificationValuesInSettings(getPrefContext(), shortcutTypes));