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

Commit 76430b42 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'sup-a11y' into mnc-dev 

* changes:
  Make keyguard indication an a11y live view
  Hide keyguard status view from a11y when QS expanded
  Hide keyguard bottom area from a11y when alpha is zero
  Remove unusable a11y focusable area from pattern unlock
  Hide StatusBarWindowView from a11y when bouncer is up
parents 9481227f aa619a62

packages/Keyguard/res/layout/keyguard_pattern_view.xml

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
    android:clipToPadding="false"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:gravity="center_horizontal"

    android:contentDescription="@string/keyguard_accessibility_pattern_unlock">

    android:gravity="center_horizontal">



    <FrameLayout

        android:layout_width="match_parent"

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
        android:gravity="center_horizontal"

        android:textStyle="italic"

        android:textColor="#ffffff"

        android:textAppearance="?android:attr/textAppearanceSmall" />

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:accessibilityLiveRegion="polite" />



    <FrameLayout

        android:id="@+id/preview_container"

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+5 −2
Original line number Diff line number Diff line
@@ -1720,8 +1720,11 @@ public class NotificationPanelView extends PanelView implements 
    }



    private void updateKeyguardBottomAreaAlpha() {

        mKeyguardBottomArea.setAlpha(

                Math.min(getKeyguardContentsAlpha(), 1 - getQsExpansionFraction()));

        float alpha = Math.min(getKeyguardContentsAlpha(), 1 - getQsExpansionFraction());

        mKeyguardBottomArea.setAlpha(alpha);

        mKeyguardBottomArea.setImportantForAccessibility(alpha == 0f

                ? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                : IMPORTANT_FOR_ACCESSIBILITY_AUTO);

    }



    private float getNotificationsTopY() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java

+6 −3
Original line number Diff line number Diff line
@@ -81,10 +81,13 @@ public class PanelBar extends FrameLayout { 
    }



    public void setBouncerShowing(boolean showing) {

        int important = showing ? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                : IMPORTANT_FOR_ACCESSIBILITY_AUTO;



        setImportantForAccessibility(important);



        if (mPanelHolder != null) {

            mPanelHolder.setImportantForAccessibility(

                    showing ? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                            : IMPORTANT_FOR_ACCESSIBILITY_AUTO);

            mPanelHolder.setImportantForAccessibility(important);

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+3 −0
Original line number Diff line number Diff line
@@ -1861,6 +1861,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 


    public void setQsExpanded(boolean expanded) {

        mStatusBarWindowManager.setQsExpanded(expanded);

        mKeyguardStatusView.setImportantForAccessibility(expanded

                ? View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                : View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);

    }



    public boolean isGoingToNotificationShade() {