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

Commit 4774eae1 authored by Anton Potapov's avatar Anton Potapov
Browse files

Changing the a11y order for ringer buttons 

Flag: n/a
Test: atest VolumeDialogImplTest
Test: manual on the phone with the voiceover tuned on.
Fixes: 320601413
Fixes: 320596960
Change-Id: I3d14e6828b30a5685cb2817b835c157d99454b8e
parent b828afed

packages/SystemUI/res/layout/volume_ringer_drawer.xml

+8 −6
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ 
                    android:layout_width="@dimen/volume_ringer_drawer_icon_size"

                    android:layout_height="@dimen/volume_ringer_drawer_icon_size"

                    android:layout_gravity="center"

                    android:tint="?android:attr/textColorPrimary"

                    android:src="@drawable/ic_volume_ringer_vibrate" />

                    android:src="@drawable/ic_volume_ringer_vibrate"

                    android:tint="?android:attr/textColorPrimary" />



            </FrameLayout>
@@ -76,6 +76,7 @@ 
                android:id="@+id/volume_drawer_mute"

                android:layout_width="@dimen/volume_ringer_drawer_item_size"

                android:layout_height="@dimen/volume_ringer_drawer_item_size"

                android:accessibilityTraversalAfter="@id/volume_drawer_vibrate"

                android:contentDescription="@string/volume_ringer_hint_mute"

                android:gravity="center">
@@ -84,8 +85,8 @@ 
                    android:layout_width="@dimen/volume_ringer_drawer_icon_size"

                    android:layout_height="@dimen/volume_ringer_drawer_icon_size"

                    android:layout_gravity="center"

                    android:tint="?android:attr/textColorPrimary"

                    android:src="@drawable/ic_speaker_mute" />

                    android:src="@drawable/ic_speaker_mute"

                    android:tint="?android:attr/textColorPrimary" />



            </FrameLayout>
@@ -93,6 +94,7 @@ 
                android:id="@+id/volume_drawer_normal"

                android:layout_width="@dimen/volume_ringer_drawer_item_size"

                android:layout_height="@dimen/volume_ringer_drawer_item_size"

                android:accessibilityTraversalAfter="@id/volume_drawer_mute"

                android:contentDescription="@string/volume_ringer_hint_unmute"

                android:gravity="center">
@@ -101,8 +103,8 @@ 
                    android:layout_width="@dimen/volume_ringer_drawer_icon_size"

                    android:layout_height="@dimen/volume_ringer_drawer_icon_size"

                    android:layout_gravity="center"

                    android:tint="?android:attr/textColorPrimary"

                    android:src="@drawable/ic_speaker_on" />

                    android:src="@drawable/ic_speaker_on"

                    android:tint="?android:attr/textColorPrimary" />



            </FrameLayout>

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+7 −4
Original line number Diff line number Diff line
@@ -1129,7 +1129,9 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
        }



        updateSelectedRingerContainerDescription(true);



        mSelectedRingerContainer.setImportantForAccessibility(

                View.IMPORTANT_FOR_ACCESSIBILITY_NO);

        mSelectedRingerContainer.clearFocus();

        mIsRingerDrawerOpen = true;

    }
@@ -1175,7 +1177,8 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
                .start();



        updateSelectedRingerContainerDescription(false);



        mSelectedRingerContainer.setImportantForAccessibility(

                View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);

        mIsRingerDrawerOpen = false;

    }