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

Merge "Set the shortcut size to large when user enabled Magnification" into main

Browse Source
This commit is contained in:
Jean Chen
2023-07-11 07:43:01 +00:00
committed by Android (Google) Code Review
parent 70c66ab121 137cc9af68
commit 9a2e9c966b
3 changed files with 84 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/accessibility/FloatingMenuSizePreferenceController.java
View File

@@ -52,11 +52,12 @@ public class FloatingMenuSizePreferenceController extends BasePreferenceControll
@Retention(RetentionPolicy.SOURCE)
@IntDef({
Size.UNKNOWN,
Size.SMALL,
Size.LARGE,
})
@VisibleForTesting
@interface Size {
public @interface Size {
int UNKNOWN = -1;
int SMALL = 0;
int LARGE = 1;
}

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

@@ -643,6 +643,17 @@ public class ToggleScreenMagnificationPreferenceFragment extends
joiner.add(MAGNIFICATION_CONTROLLER_NAME);
Settings.Secure.putString(context.getContentResolver(), targetKey, joiner.toString());
// The size setting defaults to unknown. If the user has ever manually changed the size
// before, we do not automatically change it.
if (shortcutType == UserShortcutType.SOFTWARE
&& Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
FloatingMenuSizePreferenceController.Size.UNKNOWN)
== FloatingMenuSizePreferenceController.Size.UNKNOWN) {
Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
FloatingMenuSizePreferenceController.Size.LARGE);
}
}
@VisibleForTesting