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

Commit 0a79d2fb authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am dce5af63: Merge "Fix GlowPadView accessibility behavior." into jb-dev 

* commit 'dce5af63':
  Fix GlowPadView accessibility behavior.
parents e44440f4 dce5af63

core/java/com/android/internal/widget/multiwaveview/GlowPadView.java

+4 −10
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ public class GlowPadView extends View { 
                }

                if (AccessibilityManager.getInstance(mContext).isEnabled()) {

                    String targetContentDescription = getTargetDescription(activeTarget);

                    announceText(targetContentDescription);

                    announceForAccessibility(targetContentDescription);

                }

            }

        }
@@ -1089,16 +1089,10 @@ public class GlowPadView extends View { 
                String text = String.format(directionDescription, targetDescription);

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

core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:gravity="center"

            android:focusable="true"



            android:targetDrawables="@array/lockscreen_targets_with_camera"

            android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
            android:layout_rowSpan="7"

            android:layout_gravity="center_vertical|right"

            android:gravity="center"

            android:focusable="true"



            android:targetDrawables="@array/lockscreen_targets_with_camera"

            android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

core/res/res/layout/keyguard_screen_tab_unlock.xml

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 
            android:layout_height="match_parent"

            android:layout_alignParentBottom="true"

            android:gravity="top"

            android:focusable="true"



            android:targetDrawables="@array/lockscreen_targets_with_camera"

            android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
        android:layout_height="match_parent"

        android:layout_rowSpan="7"

        android:gravity="left|center_vertical"

        android:focusable="true"



        android:targetDrawables="@array/lockscreen_targets_with_camera"

        android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"