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

Merge "Use the main thread to update alignment indication" into qt-qpr1-dev am: 94431615b1

Browse Source 
Change-Id: Ibd86563b5d894e2d6623e17986cf13814fb0268a
This commit is contained in:
Automerger Merge Worker
2020-02-11 03:58:52 +00:00
parent cd9e71744e 94431615b1
commit a939bb2f64
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -166,7 +166,8 @@ public class KeyguardIndicationController implements StateListener,
mStatusBarStateController = statusBarStateController; mStatusBarStateController = statusBarStateController;
mKeyguardUpdateMonitor = keyguardUpdateMonitor; mKeyguardUpdateMonitor = keyguardUpdateMonitor;
mDockManager = dockManager; mDockManager = dockManager;
mDockManager.addAlignmentStateListener(this::handleAlignStateChanged); mDockManager.addAlignmentStateListener(
alignState -> mHandler.post(() -> handleAlignStateChanged(alignState)));
// lock icon is not used on all form factors. // lock icon is not used on all form factors.
if (mLockIcon != null) { if (mLockIcon != null) {
mLockIcon.setOnLongClickListener(this::handleLockLongClick); mLockIcon.setOnLongClickListener(this::handleLockLongClick);

50
packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java
View File

@@ -223,12 +223,14 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
@Test @Test
public void onAlignmentStateChanged_showsSlowChargingIndication() { public void onAlignmentStateChanged_showsSlowChargingIndication() {
createController(); mInstrumentation.runOnMainSync(() -> {
verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture()); createController();
mController.setVisible(true); verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
mController.setVisible(true);
mAlignmentListener.getValue().onAlignmentStateChanged( mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_POOR);
DockManager.ALIGN_STATE_POOR); });
mInstrumentation.waitForIdleSync();
assertThat(mTextView.getText()).isEqualTo( assertThat(mTextView.getText()).isEqualTo(
mContext.getResources().getString(R.string.dock_alignment_slow_charging)); mContext.getResources().getString(R.string.dock_alignment_slow_charging));
@@ -238,11 +240,14 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
@Test @Test
public void onAlignmentStateChanged_showsNotChargingIndication() { public void onAlignmentStateChanged_showsNotChargingIndication() {
createController(); mInstrumentation.runOnMainSync(() -> {
verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture()); createController();
mController.setVisible(true); verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
mController.setVisible(true);
mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_TERRIBLE); mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_TERRIBLE);
});
mInstrumentation.waitForIdleSync();
assertThat(mTextView.getText()).isEqualTo( assertThat(mTextView.getText()).isEqualTo(
mContext.getResources().getString(R.string.dock_alignment_not_charging)); mContext.getResources().getString(R.string.dock_alignment_not_charging));
@@ -252,13 +257,15 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
@Test @Test
public void onAlignmentStateChanged_whileDozing_showsSlowChargingIndication() { public void onAlignmentStateChanged_whileDozing_showsSlowChargingIndication() {
createController(); mInstrumentation.runOnMainSync(() -> {
verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture()); createController();
mController.setVisible(true); verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
mController.setDozing(true); mController.setVisible(true);
mController.setDozing(true);
mAlignmentListener.getValue().onAlignmentStateChanged( mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_POOR);
DockManager.ALIGN_STATE_POOR); });
mInstrumentation.waitForIdleSync();
assertThat(mTextView.getText()).isEqualTo( assertThat(mTextView.getText()).isEqualTo(
mContext.getResources().getString(R.string.dock_alignment_slow_charging)); mContext.getResources().getString(R.string.dock_alignment_slow_charging));
@@ -268,12 +275,15 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
@Test @Test
public void onAlignmentStateChanged_whileDozing_showsNotChargingIndication() { public void onAlignmentStateChanged_whileDozing_showsNotChargingIndication() {
createController(); mInstrumentation.runOnMainSync(() -> {
verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture()); createController();
mController.setVisible(true); verify(mDockManager).addAlignmentStateListener(mAlignmentListener.capture());
mController.setDozing(true); mController.setVisible(true);
mController.setDozing(true);
mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_TERRIBLE); mAlignmentListener.getValue().onAlignmentStateChanged(DockManager.ALIGN_STATE_TERRIBLE);
});
mInstrumentation.waitForIdleSync();
assertThat(mTextView.getText()).isEqualTo( assertThat(mTextView.getText()).isEqualTo(
mContext.getResources().getString(R.string.dock_alignment_not_charging)); mContext.getResources().getString(R.string.dock_alignment_not_charging));