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

Commit ad5bf9b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "QS: swap order of content description"

parents b64a98e3 92de7197

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ 
    <!-- Accessibility label for Auto-ratate QuickSettings tile [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_rotation">Auto-rotate screen</string>

    <!-- Accessibility label for value of Auto-ratate QuickSettings tile [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_rotation_value">Set to <xliff:g name="rotation" example="Portrait">%s</xliff:g></string>

    <string name="accessibility_quick_settings_rotation_value"><xliff:g name="rotation" example="Portrait">%s</xliff:g> mode</string>

    <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->

    <string name="quick_settings_rotation_locked_label">Rotation locked</string>

    <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->

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

+3 −3
Original line number Diff line number Diff line
@@ -136,13 +136,13 @@ public class RotationLockTile extends QSTileImpl<BooleanState> { 
     */

    private String getAccessibilityString(boolean locked) {

        if (locked) {

            return mContext.getString(R.string.accessibility_quick_settings_rotation) + ","

                    + mContext.getString(R.string.accessibility_quick_settings_rotation_value,

            return mContext.getString(R.string.accessibility_quick_settings_rotation_value,

                    isCurrentOrientationLockPortrait(mController, mContext)

                            ? mContext.getString(

                                    R.string.quick_settings_rotation_locked_portrait_label)

                            : mContext.getString(

                                    R.string.quick_settings_rotation_locked_landscape_label));

                                    R.string.quick_settings_rotation_locked_landscape_label))

                    + "," + mContext.getString(R.string.accessibility_quick_settings_rotation);



        } else {

            return mContext.getString(R.string.accessibility_quick_settings_rotation);