Merge "QR Code Scanner tile says "Updating" when GMSCORE is updating" into tm-qpr-dev (afd9d50f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -1321,6 +1321,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>

+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

+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);
		}
		}