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

Commit 29e3080a authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed accessibility issues with quick settings" into lmp-dev

parents 12450c72 e5557a97

packages/SystemUI/res/layout/keyguard_status_bar.xml

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ 
            android:paddingEnd="@dimen/battery_level_padding_end"

            android:textColor="#ffffff"

            android:visibility="gone"

            android:textSize="@dimen/battery_level_text_size"/>

            android:textSize="@dimen/battery_level_text_size"

            android:importantForAccessibility="noHideDescendants"/>

    </LinearLayout>



    <com.android.keyguard.CarrierText

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ 
            android:layout_marginStart="@dimen/header_battery_margin_expanded"

            android:paddingEnd="@dimen/battery_level_padding_end"

            android:textColor="#ffffff"

            android:textSize="@dimen/battery_level_text_size"/>

            android:textSize="@dimen/battery_level_text_size"

            android:importantForAccessibility="noHideDescendants"/>

    </LinearLayout>



    <TextView

packages/SystemUI/res/values/strings.xml

+8 −1
Original line number Diff line number Diff line
@@ -273,6 +273,13 @@ 
    <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_wifi_signal_full">Wifi signal full.</string>



    <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->

    <string name="accessibility_wifi_name">Connected to <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string>



    <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->

    <string name="accessibility_bluetooth_name">Connected to <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>





    <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_no_wimax">No WiMAX.</string>

    <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -398,7 +405,7 @@ 
    <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>

    <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="network" example="MyWifiNetwork">%2$s</xliff:g></string>

    <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>.</string>

    <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_mobile">Mobile <xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="type" example="4G">%2$s</xliff:g>. <xliff:g id="network" example="T-Mobile">%3$s</xliff:g>.</string>

    <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->

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

+1 −1
Original line number Diff line number Diff line
@@ -347,8 +347,8 @@ public class QSPanel extends ViewGroup { 
        }



        for (TileRecord record : mRecords) {

            if (record.tileView.getVisibility() == GONE) continue;

            record.tileView.setDual(record.tile.supportsDualTargets());

            if (record.tileView.getVisibility() == GONE) continue;

            final int cw = record.row == 0 ? mLargeCellWidth : mCellWidth;

            final int ch = record.row == 0 ? mLargeCellHeight : mCellHeight;

            record.tileView.measure(exactly(cw), exactly(ch));

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

+6 −1
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ public abstract class QSTile<TState extends State> implements Listenable { 
        public Drawable icon;

        public String label;

        public String contentDescription;

        public String dualLabelContentDescription;



        public boolean copyTo(State other) {

            if (other == null) throw new IllegalArgumentException();
@@ -294,12 +295,15 @@ public abstract class QSTile<TState extends State> implements Listenable { 
                    || other.iconId != iconId

                    || !Objects.equals(other.icon, icon)

                    || !Objects.equals(other.label, label)

                    || !Objects.equals(other.contentDescription, contentDescription);

                    || !Objects.equals(other.contentDescription, contentDescription)

                    || !Objects.equals(other.dualLabelContentDescription,

                    dualLabelContentDescription);

            other.visible = visible;

            other.iconId = iconId;

            other.icon = icon;

            other.label = label;

            other.contentDescription = contentDescription;

            other.dualLabelContentDescription = dualLabelContentDescription;

            return changed;

        }
@@ -315,6 +319,7 @@ public abstract class QSTile<TState extends State> implements Listenable { 
            sb.append(",icon=").append(icon);

            sb.append(",label=").append(label);

            sb.append(",contentDescription=").append(contentDescription);

            sb.append(",dualLabelContentDescription=").append(dualLabelContentDescription);

            return sb.append(']');

        }

    }