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

Merge "Fix GlowPadView accessibility behavior." into jb-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-06-20 16:52:16 -07:00
committed by Android (Google) Code Review
parent bd6b1820d9 78bfb98295
commit dce5af632c
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
View File

@@ -881,7 +881,7 @@ public class GlowPadView extends View {
} }
if (AccessibilityManager.getInstance(mContext).isEnabled()) { if (AccessibilityManager.getInstance(mContext).isEnabled()) {
String targetContentDescription = getTargetDescription(activeTarget); String targetContentDescription = getTargetDescription(activeTarget);
announceText(targetContentDescription); announceForAccessibility(targetContentDescription);
} }
} }
} }
@@ -1089,16 +1089,10 @@ public class GlowPadView extends View {
String text = String.format(directionDescription, targetDescription); String text = String.format(directionDescription, targetDescription);
utterance.append(text); utterance.append(text);
} }
if (utterance.length() > 0) {
announceText(utterance.toString());
}
} }
} if (utterance.length() > 0) {
announceForAccessibility(utterance.toString());
private void announceText(String text) { }
setContentDescription(text);
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
setContentDescription(null);
} }
private String getTargetDescription(int index) { private String getTargetDescription(int index) {

1
core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml
View File

@@ -89,6 +89,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center" android:gravity="center"
android:focusable="true"
android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDrawables="@array/lockscreen_targets_with_camera"
android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

1
core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml
View File

@@ -89,6 +89,7 @@
android:layout_rowSpan="7" android:layout_rowSpan="7"
android:layout_gravity="center_vertical|right" android:layout_gravity="center_vertical|right"
android:gravity="center" android:gravity="center"
android:focusable="true"
android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDrawables="@array/lockscreen_targets_with_camera"
android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

1
core/res/res/layout/keyguard_screen_tab_unlock.xml
View File

@@ -130,6 +130,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:gravity="top" android:gravity="top"
android:focusable="true"
android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDrawables="@array/lockscreen_targets_with_camera"
android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

1
core/res/res/layout/keyguard_screen_tab_unlock_land.xml
View File

@@ -135,6 +135,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_rowSpan="7" android:layout_rowSpan="7"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:focusable="true"
android:targetDrawables="@array/lockscreen_targets_with_camera" android:targetDrawables="@array/lockscreen_targets_with_camera"
android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera" android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"