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

Commit 914ce40a authored by Abirami Kalyan's avatar Abirami Kalyan Committed by Android (Google) Code Review
Browse files

Merge "Change default value in Magnification always on setting to use config... 

Merge "Change default value in Magnification always on setting to use config value as default value." into main
parents 8867b014 508dc740

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -6068,10 +6068,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 


    @GuardedBy("mLock")

    boolean readAlwaysOnMagnificationLocked(AccessibilityUserState userState) {

        int alwaysOnSettingsDefaultValue = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_magnification_always_on_enabled) ? 1 : 0;

        final boolean isSettingsAlwaysOnEnabled = Settings.Secure.getIntForUser(

                mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,

                1, userState.mUserId) == 1;

                alwaysOnSettingsDefaultValue, userState.mUserId) == 1;

        final boolean isAlwaysOnFeatureFlagEnabled = mMagnificationController

                .isAlwaysOnMagnificationFeatureFlagEnabled();

        final boolean isAlwaysOnEnabled = isAlwaysOnFeatureFlagEnabled && isSettingsAlwaysOnEnabled;