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

Merge "Fix lifecycle states in QSTileImpl" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-23 23:19:59 +00:00
committed by Android (Google) Code Review
parent 234a31e2f5 f455951c66
commit ebb0640c62
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
View File

@@ -14,8 +14,8 @@
package com.android.systemui.qs.tileimpl; package com.android.systemui.qs.tileimpl;
import static androidx.lifecycle.Lifecycle.State.DESTROYED;
import static androidx.lifecycle.Lifecycle.State.RESUMED; import static androidx.lifecycle.Lifecycle.State.RESUMED;
import static androidx.lifecycle.Lifecycle.State.STARTED;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_CLICK; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_CLICK;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_LONG_PRESS; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_LONG_PRESS;
@@ -432,17 +432,19 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy
} }
private void handleSetListeningInternal(Object listener, boolean listening) { private void handleSetListeningInternal(Object listener, boolean listening) {
// This should be used to go from resumed to paused. Listening for ON_RESUME and ON_PAUSE
// in this lifecycle will determine the listening window.
if (listening) { if (listening) {
if (mListeners.add(listener) && mListeners.size() == 1) { if (mListeners.add(listener) && mListeners.size() == 1) {
if (DEBUG) Log.d(TAG, "handleSetListening true"); if (DEBUG) Log.d(TAG, "handleSetListening true");
mLifecycle.markState(RESUMED); mLifecycle.setCurrentState(RESUMED);
handleSetListening(listening); handleSetListening(listening);
refreshState(); // Ensure we get at least one refresh after listening. refreshState(); // Ensure we get at least one refresh after listening.
} }
} else { } else {
if (mListeners.remove(listener) && mListeners.size() == 0) { if (mListeners.remove(listener) && mListeners.size() == 0) {
if (DEBUG) Log.d(TAG, "handleSetListening false"); if (DEBUG) Log.d(TAG, "handleSetListening false");
mLifecycle.markState(DESTROYED); mLifecycle.setCurrentState(STARTED);
handleSetListening(listening); handleSetListening(listening);
} }
} }

43
packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java
View File

@@ -14,6 +14,10 @@
package com.android.systemui.qs.tileimpl; package com.android.systemui.qs.tileimpl;
import static androidx.lifecycle.Lifecycle.State.DESTROYED;
import static androidx.lifecycle.Lifecycle.State.RESUMED;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_CLICK; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_CLICK;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_LONG_PRESS; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_LONG_PRESS;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_SECONDARY_CLICK; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_QS_SECONDARY_CLICK;
@@ -23,6 +27,9 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_ACTION; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_ACTION;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
@@ -267,6 +274,42 @@ public class QSTileImplTest extends SysuiTestCase {
verify(mQsLogger).logTileChangeListening(SPEC, false); verify(mQsLogger).logTileChangeListening(SPEC, false);
} }
@Test
public void testListeningTrue_stateAtLeastResumed() {
mTile.setListening(new Object(), true); // Listen with some object
TestableLooper.get(this).processAllMessages();
assertTrue(mTile.getLifecycle().getCurrentState().isAtLeast(RESUMED));
}
@Test
public void testTileDoesntStartResumed() {
assertFalse(mTile.getLifecycle().getCurrentState().isAtLeast(RESUMED));
}
@Test
public void testListeningFalse_stateAtMostCreated() {
Object o = new Object();
mTile.setListening(o, true);
mTile.setListening(o, false);
TestableLooper.get(this).processAllMessages();
assertFalse(mTile.getLifecycle().getCurrentState().isAtLeast(RESUMED));
}
@Test
public void testListeningFalse_stateNotDestroyed() {
Object o = new Object();
mTile.setListening(o, true);
mTile.setListening(o, false);
TestableLooper.get(this).processAllMessages();
assertNotEquals(DESTROYED, mTile.getLifecycle().getCurrentState());
}
private void assertEvent(UiEventLogger.UiEventEnum eventType, private void assertEvent(UiEventLogger.UiEventEnum eventType,
UiEventLoggerFake.FakeUiEvent fakeEvent) { UiEventLoggerFake.FakeUiEvent fakeEvent) {
assertEquals(eventType.getId(), fakeEvent.eventId); assertEquals(eventType.getId(), fakeEvent.eventId);