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

Commit b4a8d160 authored by Rohan Shah's avatar Rohan Shah Committed by android-build-merger
Browse files

Merge "[QS] Update mobile tile secondary text" into pi-dev am: 497bc2cb 

am: 4fabf022

Change-Id: Ic5469eac4ee00653704926f111520d5aca030e71
parents b35cceb2 4fabf022

packages/SystemUI/res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -405,7 +405,10 @@ 
    <string name="accessibility_cell_data_on">Mobile Data On</string>



    <!-- Content description of the cell data being disabled. [CHAR LIMIT=NONE] -->

    <string name="cell_data_off">Mobile data off</string>

    <string name="cell_data_off_content_description">Mobile data off</string>



    <!-- Content description of the cell data being disabled but shortened. [CHAR LIMIT=20] -->

    <string name="cell_data_off">Off</string>



    <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_bluetooth_tether">Bluetooth tethering.</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
            if (TextUtils.equals(mInfo.typeContentDescription,

                    mContext.getString(R.string.data_connection_no_internet))

                || TextUtils.equals(mInfo.typeContentDescription,

                    mContext.getString(R.string.cell_data_off))) {

                    mContext.getString(R.string.cell_data_off_content_description))) {

                contentDescription.append(mInfo.typeContentDescription);

            }

            mMobileSignal.setContentDescription(contentDescription);

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

+12 −1
Original line number Diff line number Diff line
@@ -194,7 +194,18 @@ public class CellularTile extends QSTileImpl<SignalState> { 
            state.state = Tile.STATE_INACTIVE;

            state.secondaryLabel = r.getString(R.string.cell_data_off);

        }

        state.contentDescription = state.label + ", " + state.secondaryLabel;





        // TODO(b/77881974): Instead of switching out the description via a string check for

        // we need to have two strings provided by the MobileIconGroup.

        final CharSequence contentDescriptionSuffix;

        if (state.state == Tile.STATE_INACTIVE) {

            contentDescriptionSuffix = r.getString(R.string.cell_data_off_content_description);

        } else {

            contentDescriptionSuffix = state.secondaryLabel;

        }



        state.contentDescription = state.label + ", " + contentDescriptionSuffix;

    }



    private CharSequence getMobileDataDescription(CallbackInfo cb) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ class TelephonyIcons { 
            0,

            0,

            AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0],

            R.string.cell_data_off,

            R.string.cell_data_off_content_description,

            0,

            false);

}