Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d0ddffe authored by Rhed Jao's avatar Rhed Jao
Browse files

Migrates the navi-bar magnification setting key 

Adds a11y magnification feature name to a11y button targets setting key,
if user had turned on the navi-bar magnify.

Bug: 152263749
Test: atest SettingsProviderTest
Change-Id: Ifd892f165bb0cb2e4f789d791da064b784ab271d
parent f3b2dc9b

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+2 −10
Original line number Diff line number Diff line
@@ -4692,24 +4692,16 @@ public class SettingsProvider extends ContentProvider { 


                if (currentVersion == 185) {

                    // Deprecate ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, and migrate it

                    // to ACCESSIBILITY_BUTTON_TARGET_COMPONENT.

                    // to ACCESSIBILITY_BUTTON_TARGETS.

                    final SettingsState secureSettings = getSecureSettingsLocked(userId);

                    final Setting magnifyNavbarEnabled = secureSettings.getSettingLocked(

                            Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);

                    if ("1".equals(magnifyNavbarEnabled.getValue())) {

                        secureSettings.insertSettingLocked(

                                Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT,

                                Secure.ACCESSIBILITY_BUTTON_TARGETS,

                                ACCESSIBILITY_SHORTCUT_TARGET_MAGNIFICATION_CONTROLLER,

                                null /* tag */, false /* makeDefault */,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                    } else {

                        // Clear a11y button targets list setting. A11yManagerService will end up

                        // adding all legacy enabled services that want the button to the list, so

                        // there's no need to keep tracking them.

                        secureSettings.insertSettingLocked(

                                Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT,

                                null, null /* tag */, false /* makeDefault */,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                    }

                    secureSettings.deleteSettingLocked(

                            Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);