Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[QS] Update mobile tile secondary text" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-11 21:29:20 +00:00
committed by Android (Google) Code Review
parent 992f6120c0 7bc3744ccd
commit 497bc2cbe9
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/values/strings.xml
View File

@@ -405,7 +405,10 @@
<string name="accessibility_cell_data_on">Mobile Data On</string> <string name="accessibility_cell_data_on">Mobile Data On</string>
<!-- Content description of the cell data being disabled. [CHAR LIMIT=NONE] --> <!-- 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] --> <!-- 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> <string name="accessibility_bluetooth_tether">Bluetooth tethering.</string>

2
packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
View File

@@ -383,7 +383,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
if (TextUtils.equals(mInfo.typeContentDescription, if (TextUtils.equals(mInfo.typeContentDescription,
mContext.getString(R.string.data_connection_no_internet)) mContext.getString(R.string.data_connection_no_internet))
|| TextUtils.equals(mInfo.typeContentDescription, || TextUtils.equals(mInfo.typeContentDescription,
mContext.getString(R.string.cell_data_off))) { mContext.getString(R.string.cell_data_off_content_description))) {
contentDescription.append(mInfo.typeContentDescription); contentDescription.append(mInfo.typeContentDescription);
} }
mMobileSignal.setContentDescription(contentDescription); mMobileSignal.setContentDescription(contentDescription);

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

@@ -194,7 +194,18 @@ public class CellularTile extends QSTileImpl<SignalState> {
state.state = Tile.STATE_INACTIVE; state.state = Tile.STATE_INACTIVE;
state.secondaryLabel = r.getString(R.string.cell_data_off); 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) { private CharSequence getMobileDataDescription(CallbackInfo cb) {

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

@@ -208,7 +208,7 @@ class TelephonyIcons {
0, 0,
0, 0,
AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0],
R.string.cell_data_off, R.string.cell_data_off_content_description,
0, 0,
false); false);
} }