diff options
4 files changed, 18 insertions, 4 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index c1e187314e37..29f13359da5b 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -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> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index cf549fa634f5..28dd26f4f00b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 2abe9d9285fb..4554c79712d6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -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) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java index 7e6fe022644a..bd768202aa7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -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); } |