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

Commit 427bb824 authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge "Remove announceForAccessibility and add pane title for... 

Merge "Remove announceForAccessibility and add pane title for WindowMagnificationSettings" into main
parents af160a03 519e3aed

packages/SystemUI/res/layout/window_magnification_settings_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:orientation="vertical"

    android:padding="@dimen/magnification_setting_background_padding"

    android:focusable="true"

    android:accessibilityPaneTitle="@string/accessibility_magnification_settings_panel_description"

    android:contentDescription="@string/accessibility_magnification_settings_panel_description">

    <LinearLayout

        android:layout_width="match_parent"

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

+0 −9
Original line number Diff line number Diff line
@@ -392,15 +392,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest 
            setSystemGestureExclusion();

            mIsVisible = true;

            mCallback.onSettingsPanelVisibilityChanged(/* shown= */ true);



            if (resetPosition) {

                // We could not put focus on the settings panel automatically

                // since it is an inactive window. Therefore, we announce the existence of

                // magnification settings for accessibility when it is opened.

                mSettingView.announceForAccessibility(

                        mContext.getResources().getString(

                                R.string.accessibility_magnification_settings_panel_description));

            }

        }

        mContext.registerReceiver(mScreenOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));

    }