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

Commit 94a9f681 authored by Candice Lo's avatar Candice Lo Committed by Automerger Merge Worker
Browse files

Merge "Fix the layout flag for magnification settings" into udc-dev am: 30a68e5f am: 420cd993 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21894198



Change-Id: I8ca6686cfe3464771184bd9680edd2a031b7a702
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e08f6f3 420cd993

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

+1 −5
Original line number Diff line number Diff line
@@ -346,10 +346,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
            }



            mWindowManager.addView(mSettingView, mParams);

            if (resetPosition) {

                // Request focus on the settings panel when position of the panel is reset.

                mSettingView.requestFocus();

            }



            // Exclude magnification switch button from system gesture area.

            setSystemGestureExclusion();
@@ -534,7 +530,7 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
                LayoutParams.WRAP_CONTENT,

                LayoutParams.WRAP_CONTENT,

                LayoutParams.TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY,

                /* _flags= */ 0,

                LayoutParams.FLAG_NOT_FOCUSABLE,

                PixelFormat.TRANSPARENT);

        params.gravity = Gravity.TOP | Gravity.START;

        params.accessibilityTitle = getAccessibilityWindowTitle(context);

packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationSettingsTest.java

+0 −7
Original line number Diff line number Diff line
@@ -201,13 +201,6 @@ public class WindowMagnificationSettingsTest extends SysuiTestCase { 
        assertThat(magnifierMediumButton.isSelected()).isTrue();

    }



    @Test

    public void showSettingPanel_focusOnThePanel() {

        mWindowMagnificationSettings.showSettingPanel();



        assertThat(mSettingView.isFocused()).isTrue();

    }



    private <T extends View> T getInternalView(@IdRes int idRes) {

        T view = mSettingView.findViewById(idRes);

        assertNotNull(view);