summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author ronish <ronish@google.com> 2022-03-10 17:07:58 +0000
committer ronish <ronish@google.com> 2022-03-10 17:07:58 +0000
commitfd22e97a19a88948b515f03d827f09a0b43c76c1 (patch)
tree30b19d47d3d59b590894c3058bbc38fabfc83268
parent7186d0bbfd35f89fbe4fa3bde5dc07463ddf4cc9 (diff)
Update scanner strings as per UXR reviews
Test: Manually Bug: 223550089 Change-Id: If6d4977ea29862996735f1f45c0f1b3a11a7794a
-rw-r--r--packages/SystemUI/res/values/strings.xml5
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java1
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java2
3 files changed, 1 insertions, 7 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 9f2f1c1978c6..d230f33f4939 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -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>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java
index b65802506cbf..b41502213555 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java
@@ -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
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java
index 8297850d21a1..b652aee0f6aa 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QRCodeScannerTileTest.java
@@ -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