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

Commit 32e9ebe7 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix QS accessibility issues" into nyc-dev 

am: 97e4c5e6

* commit '97e4c5e6':
  Fix QS accessibility issues

Change-Id: I02bf26ebbc7e271c0eb862b9373734ac1c65014a
parents 609b81c8 97e4c5e6

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
            android:clickable="true"

            android:focusable="true"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:contentDescription="@string/accessibility_quick_settings_expand"

            android:padding="12dp" />



    </LinearLayout>

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -1594,4 +1594,7 @@ 
    <!-- Warning message when we try to dock a non-resizeble tasks and launch it in fullscreen instead. -->

    <string name="dock_non_resizeble_failed_to_dock_text">App does not support split-screen.</string>



    <!-- accessibility label for button to expand quick settings [CHAR LIMIT=NONE] -->

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



</resources>

packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll 
            }

        };

        state.label = percentage;

        state.contentDescription = mContext.getString(R.string.accessibility_quick_settings_battery,

                percentage);

    }



    @Override