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

Commit 4ca6e15b authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "fix(#AlwaysOnMagnifier): Fix testSetConfigWithActivatedFalse_expectedConfig fails"

parents b27a554f 0c1c8779

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java

+2 −3
Original line number Diff line number Diff line
@@ -398,13 +398,12 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
        mChangeModeButton = mSettingView.findViewById(R.id.magnifier_full_button);



        mZoomSeekbar = mSettingView.findViewById(R.id.magnifier_zoom_slider);



        mZoomSeekbar.setOnSeekBarChangeListener(new ZoomSeekbarChangeListener());



        float scale = mSecureSettings.getFloatForUser(

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, 0,

                UserHandle.USER_CURRENT);

        setSeekbarProgress(scale);

        mZoomSeekbar.setOnSeekBarChangeListener(new ZoomSeekbarChangeListener());



        mAllowDiagonalScrollingSwitch =

                (Switch) mSettingView.findViewById(R.id.magnifier_horizontal_lock_switch);

        mAllowDiagonalScrollingSwitch.setChecked(mAllowDiagonalScrolling);