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

Merge "Update scanner strings as per UXR reviews" into tm-dev

Browse Source
This commit is contained in:
Ronish Kalia
2022-03-14 14:20:55 +00:00
committed by Android (Google) Code Review
parent 81aa343c4c fd22e97a19
commit 1f73cac8ba
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1193,10 +1193,7 @@
<string name="wallet_lockscreen_settings_label">Lock screen settings</string>
<!-- QR Code Scanner label, title [CHAR LIMIT=32] -->
<string name="qr_code_scanner_title">QR code</string>
<!-- QR Code Scanner description [CHAR LIMIT=NONE] -->
<string name="qr_code_scanner_description">Tap to scan</string>
<string name="qr_code_scanner_title">Scan QR code</string>
<!-- Name of the work status bar icon. -->
<string name="status_bar_work">Work profile</string>

1
packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java
View File

@@ -117,7 +117,6 @@ public class QRCodeScannerTile extends QSTileImpl<QSTile.State> {
state.icon = ResourceIcon.get(R.drawable.ic_qr_code_scanner);
state.state = mQRCodeScannerController.isEnabledForQuickSettings() ? Tile.STATE_ACTIVE
: Tile.STATE_UNAVAILABLE;
state.secondaryLabel = mContext.getString(R.string.qr_code_scanner_description);
}
@Override

2
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java
View File

@@ -104,8 +104,6 @@ public class QRCodeScannerTileTest extends SysuiTestCase {
assertEquals(state.label, mContext.getString(R.string.qr_code_scanner_title));
assertEquals(state.contentDescription, mContext.getString(R.string.qr_code_scanner_title));
assertEquals(state.icon, QSTileImpl.ResourceIcon.get(R.drawable.ic_qr_code_scanner));
assertEquals(state.secondaryLabel,
mContext.getString(R.string.qr_code_scanner_description));
}
@Test