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

Commit 5ac8b501 authored by Ronish Kalia's avatar Ronish Kalia Committed by Automerger Merge Worker
Browse files

Merge "Update scanner strings as per UXR reviews" into tm-dev am: 1f73cac8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17155004

Change-Id: Iba669b77c34726be0079a9c1855acadd35627453
parents 24b8361c 1f73cac8

packages/SystemUI/res/values/strings.xml

+1 −4
Original line number Diff line number Diff line
@@ -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>

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

+0 −1
Original line number Diff line number Diff line
@@ -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

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

+0 −2
Original line number Diff line number Diff line
@@ -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