From 4c8331b30ac45d720e097a3e98147df89b23eef0 Mon Sep 17 00:00:00 2001 From: Roy Chou Date: Wed, 8 Feb 2023 03:17:56 +0000 Subject: [PATCH] chore(#AlwaysOnMagnifier): Replace string constant with Settings Pref Key In AccessibilityManagerService, previously we use string constant as the name in Settings getter method. After the Settings key is defined, we replace the string constants with the defined key. Bug: 146504200 Test: atest AccessibilityManagerServiceTest Change-Id: Ia31a068f9e882b2f5e5a1a3112b682006ee54fe1 --- .../server/accessibility/AccessibilityManagerService.java | 6 ++---- .../accessibility/AccessibilityManagerServiceTest.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 7e4567b91d2e0..e42a71de3a291 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -4379,9 +4379,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private final Uri mMagnificationFollowTypingUri = Settings.Secure.getUriFor( Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED); - // TODO: replace name with Settings Secure Key private final Uri mAlwaysOnMagnificationUri = Settings.Secure.getUriFor( - "accessibility_magnification_always_on_enabled"); + Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED); private final Uri mUiContrastUri = Settings.Secure.getUriFor( CONTRAST_LEVEL); @@ -4615,10 +4614,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } boolean readAlwaysOnMagnificationLocked(AccessibilityUserState userState) { - // TODO: replace name const with Settings Secure Key final boolean isSettingsAlwaysOnEnabled = Settings.Secure.getIntForUser( mContext.getContentResolver(), - "accessibility_magnification_always_on_enabled", + Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED, 0, userState.mUserId) == 1; final boolean isAlwaysOnFeatureFlagEnabled = mMagnificationController .isAlwaysOnMagnificationFeatureFlagEnabled(); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index 32b98647e78b4..cc5c2f3154df0 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -448,8 +448,7 @@ public class AccessibilityManagerServiceTest { mA11yms.getCurrentUserIdLocked()); Settings.Secure.putIntForUser( mTestableContext.getContentResolver(), - // TODO: replace name with Settings Secure Key - "accessibility_magnification_always_on_enabled", + Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED, 1, mA11yms.getCurrentUserIdLocked()); mA11yms.readAlwaysOnMagnificationLocked(userState); @@ -466,8 +465,7 @@ public class AccessibilityManagerServiceTest { mA11yms.getCurrentUserIdLocked()); Settings.Secure.putIntForUser( mTestableContext.getContentResolver(), - // TODO: replace name with Settings Secure Key - "accessibility_magnification_always_on_enabled", + Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED, 1, mA11yms.getCurrentUserIdLocked()); mA11yms.readAlwaysOnMagnificationLocked(userState);