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

Commit 36c39fd6 authored by Archi Chomal's avatar Archi Chomal Committed by Automerger Merge Worker
Browse files

Merge "UX fixes for QR code scanner QS tile" into tm-qpr-dev am: e842874d 

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



Change-Id: Id3685e00060a279c0ab20274101aba4f1ae8cdbd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c0bfee2 e842874d

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,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">Scan QR code</string>

    <string name="qr_code_scanner_title">QR code scanner</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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class QRCodeScannerTile extends QSTileImpl<QSTile.State> { 
        state.label = mContext.getString(R.string.qr_code_scanner_title);

        state.contentDescription = state.label;

        state.icon = ResourceIcon.get(R.drawable.ic_qr_code_scanner);

        state.state = mQRCodeScannerController.isEnabledForQuickSettings() ? Tile.STATE_ACTIVE

        state.state = mQRCodeScannerController.isEnabledForQuickSettings() ? Tile.STATE_INACTIVE

                : Tile.STATE_UNAVAILABLE;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -119,6 +119,6 @@ public class QRCodeScannerTileTest extends SysuiTestCase { 
        when(mController.isEnabledForQuickSettings()).thenReturn(true);

        QSTile.State state = new QSTile.State();

        mTile.handleUpdateState(state, null);

        assertEquals(state.state, Tile.STATE_ACTIVE);

        assertEquals(state.state, Tile.STATE_INACTIVE);

    }

}