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

Commit 2c8dc399 authored by Archi Chomal's avatar Archi Chomal Committed by Automerger Merge Worker
Browse files

Merge "QR Code Scanner tile says "Updating" when GMSCORE is updating" into... 

Merge "QR Code Scanner tile says "Updating" when GMSCORE is updating" into tm-qpr-dev am: afd9d50f am: 9d18bcbc

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



Change-Id: Id2ee4075a824595f7caf9768a81ff90e8bb88c4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d423bde9 9d18bcbc

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,9 @@ 
    <!-- QR Code Scanner label, title [CHAR LIMIT=32] -->

    <string name="qr_code_scanner_title">QR code scanner</string>



    <!-- QR Code Scanner Secondary label when GMS Core is Updating -->

    <string name="qr_code_scanner_updating_secondary_label">Updating</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

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ public class QRCodeScannerTile extends QSTileImpl<QSTile.State> { 
        state.icon = ResourceIcon.get(R.drawable.ic_qr_code_scanner);

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

                : Tile.STATE_UNAVAILABLE;

        // The assumption is that if the OEM has the QR code scanner module enabled then the scanner

        // would go to "Unavailable" state only when GMS core is updating.

        state.secondaryLabel = state.state == Tile.STATE_UNAVAILABLE

                ? mContext.getString(R.string.qr_code_scanner_updating_secondary_label) : null;

    }



    @Override

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

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles; 


import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertNull;



import static org.mockito.Mockito.when;
@@ -112,6 +113,8 @@ public class QRCodeScannerTileTest extends SysuiTestCase { 
        QSTile.State state = new QSTile.State();

        mTile.handleUpdateState(state, null);

        assertEquals(state.state, Tile.STATE_UNAVAILABLE);

        assertEquals(state.secondaryLabel.toString(),

                     mContext.getString(R.string.qr_code_scanner_updating_secondary_label));

    }



    @Test
@@ -120,5 +123,6 @@ public class QRCodeScannerTileTest extends SysuiTestCase { 
        QSTile.State state = new QSTile.State();

        mTile.handleUpdateState(state, null);

        assertEquals(state.state, Tile.STATE_INACTIVE);

        assertNull(state.secondaryLabel);

    }

}