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

Merge "QR Code Scanner tile says "Updating" when GMSCORE is updating" into tm-qpr-dev

Browse Source
This commit is contained in:
Archi Chomal
2022-11-22 03:54:51 +00:00
committed by Android (Google) Code Review
parent bccd7f9dce ccf7777407
commit afd9d50f8b
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1321,6 +1321,9 @@
<!-- QR Code Scanner label, title [CHAR LIMIT=32] --> <!-- QR Code Scanner label, title [CHAR LIMIT=32] -->
<string name="qr_code_scanner_title">QR code scanner</string> <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. --> <!-- Name of the work status bar icon. -->
<string name="status_bar_work">Work profile</string> <string name="status_bar_work">Work profile</string>

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

@@ -117,6 +117,10 @@ public class QRCodeScannerTile extends QSTileImpl<QSTile.State> {
state.icon = ResourceIcon.get(R.drawable.ic_qr_code_scanner); state.icon = ResourceIcon.get(R.drawable.ic_qr_code_scanner);
state.state = mQRCodeScannerController.isAbleToOpenCameraApp() ? Tile.STATE_INACTIVE state.state = mQRCodeScannerController.isAbleToOpenCameraApp() ? Tile.STATE_INACTIVE
: Tile.STATE_UNAVAILABLE; : 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 @Override

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

@@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNull;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -112,6 +113,8 @@ public class QRCodeScannerTileTest extends SysuiTestCase {
QSTile.State state = new QSTile.State(); QSTile.State state = new QSTile.State();
mTile.handleUpdateState(state, null); mTile.handleUpdateState(state, null);
assertEquals(state.state, Tile.STATE_UNAVAILABLE); assertEquals(state.state, Tile.STATE_UNAVAILABLE);
assertEquals(state.secondaryLabel.toString(),
mContext.getString(R.string.qr_code_scanner_updating_secondary_label));
} }
@Test @Test
@@ -120,5 +123,6 @@ public class QRCodeScannerTileTest extends SysuiTestCase {
QSTile.State state = new QSTile.State(); QSTile.State state = new QSTile.State();
mTile.handleUpdateState(state, null); mTile.handleUpdateState(state, null);
assertEquals(state.state, Tile.STATE_INACTIVE); assertEquals(state.state, Tile.STATE_INACTIVE);
assertNull(state.secondaryLabel);
} }
} }