Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 76430b42: Merge changes from topic \'sup-a11y\' into mnc-dev

Browse Source 
* commit '76430b42228d38f77f83e44b6307ca368963b3c5':
  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
This commit is contained in:
Adrian Roos
2015-06-10 22:09:53 +00:00
committed by Android Git Automerger
parent 369e811bfc 76430b4222
commit 0a6ebfe359
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Keyguard/res/layout/keyguard_pattern_view.xml
View File

@@ -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"

3
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -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"

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

@@ -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() {

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

@@ -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);
}
}

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

@@ -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() {