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

Commit 94444fc5 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Cleaning up the accessibility of MultiWaveView"

parents 1716fe47 57df88bc

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

+5 −5
Original line number Diff line number Diff line
@@ -902,14 +902,14 @@ public class MultiWaveView extends View { 
            String directionDescription = getDirectionDescription(i);

            if (!TextUtils.isEmpty(targetDescription)

                    && !TextUtils.isEmpty(directionDescription)) {

                utterance.append(targetDescription);

                utterance.append(" ");

                utterance.append(directionDescription);

                utterance.append(".");

            }

                String text = String.format(directionDescription, targetDescription);

                utterance.append(text);

            }

            if (utterance.length() > 0) {

                announceText(utterance.toString());

            }

        }

    }



    private void announceText(String text) {

        setContentDescription(text);

core/res/res/layout/keyguard_screen_tab_unlock.xml

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 


            android:targetDrawables="@array/lockscreen_targets_with_camera"

            android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

            android:directionDescriptions="@array/lockscreen_direction_descriptions_with_camera"

            android:directionDescriptions="@array/lockscreen_direction_descriptions"

            android:handleDrawable="@drawable/ic_lockscreen_handle"

            android:waveDrawable="@drawable/ic_lockscreen_outerring"

            android:outerRadius="@dimen/multiwaveview_target_placement_radius"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ 


        android:targetDrawables="@array/lockscreen_targets_with_camera"

        android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

        android:directionDescriptions="@array/lockscreen_direction_descriptions_with_camera"

        android:directionDescriptions="@array/lockscreen_direction_descriptions"

        android:handleDrawable="@drawable/ic_lockscreen_handle"

        android:waveDrawable="@drawable/ic_lockscreen_outerring"

        android:outerRadius="@dimen/multiwaveview_target_placement_radius"

core/res/res/values-land/arrays.xml

+1 −15
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        <item>@string/description_target_soundon</item>

    </array>



    <array name="lockscreen_direction_descriptions_when_silent">

    <array name="lockscreen_direction_descriptions">

        <item>@null</item>

        <item>@string/description_direction_up</item>

        <item>@null</item>
@@ -55,13 +55,6 @@ 
        <item>@string/description_target_silent</item>

    </array>



    <array name="lockscreen_direction_descriptions_when_soundon">

        <item>@null</item>

        <item>@string/description_direction_up</item>

        <item>@null</item>

        <item>@string/description_direction_down</item>

    </array>



    <array name="lockscreen_targets_with_camera">

        <item>@null</item>

        <item>@drawable/ic_lockscreen_unlock</item>
@@ -76,11 +69,4 @@ 
        <item>@string/description_target_camera</item>

    </array>



    <array name="lockscreen_direction_descriptions_with_camera">

        <item>@null</item>

        <item>@string/description_direction_up</item>

        <item>@null</item>

        <item>@string/description_direction_down</item>

    </array>



</resources>

core/res/res/values/arrays.xml

+1 −15
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ 
        <item>@null</item>

    </array>



    <array name="lockscreen_direction_descriptions_when_silent">

    <array name="lockscreen_direction_descriptions">

        <item>@string/description_direction_right</item>

        <item>@null</item>

        <item>@string/description_direction_left</item>
@@ -377,13 +377,6 @@ 
        <item>@null</item>

    </array>



    <array name="lockscreen_direction_descriptions_when_soundon">

        <item>@string/description_direction_right</item>

        <item>@null</item>

        <item>@string/description_direction_left</item>

        <item>@null</item>

    </array>



    <array name="lockscreen_targets_with_camera">

        <item>@drawable/ic_lockscreen_unlock</item>

        <item>@null</item>
@@ -398,11 +391,4 @@ 
        <item>@null</item>

    </array>



    <array name="lockscreen_direction_descriptions_with_camera">

        <item>@string/description_direction_right</item>

        <item>@null</item>

        <item>@string/description_direction_left</item>

        <item>@null</item>

    </array>



</resources>