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

Commit 6a150faa authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "QS: Add content description to page indicator" into nyc-dev am: 4db7675d 

am: 856577de

* commit '856577de':
  QS: Add content description to page indicator

Change-Id: Ia27d98cb9b8153ed5bb7a0a4f0dc1434a7023ad9
parents af135c5b 856577de

packages/SystemUI/res/layout/qs_paged_tile_layout.xml

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:gravity="center" />

            android:gravity="center"

            android:importantForAccessibility="yes"

            android:focusable="true" />



        <TextView

            android:id="@android:id/edit"

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -1595,4 +1595,7 @@ 
    <!-- accessibility label for button to expand quick settings [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_expand">Expand quick settings.</string>



    <!-- accessibility label for paging indicator in quick settings [CHAR LIMITi=NONE] -->

    <string name="accessibility_quick_settings_page">Page <xliff:g name="current_page" example="1">%1$d</xliff:g> of <xliff:g name="num_pages" example="2">%2$d</xliff:g></string>



</resources>

packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ public class PageIndicator extends ViewGroup { 


    public void setLocation(float location) {

        int index = (int) location;

        setContentDescription(getContext().getString(R.string.accessibility_quick_settings_page,

                (index + 1), getChildCount()));

        int position = index << 1 | ((location != index) ? 1 : 0);

        if (DEBUG) Log.d(TAG, "setLocation " + location + " " + index + " " + position);