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

Merge "Use DreamManager to get initial state." into tm-qpr-dev

Browse Source
This commit is contained in:
Bryce Lee
2023-03-20 21:15:59 +00:00
committed by Android (Google) Code Review
parent 74ce3239d2 c0b8f15e71
commit b1a1dc4d3a
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/dreams/conditions/DreamCondition.java
View File

@@ -15,6 +15,7 @@
*/ */
package com.android.systemui.dreams.conditions; package com.android.systemui.dreams.conditions;
import android.app.DreamManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -30,6 +31,7 @@ import javax.inject.Inject;
*/ */
public class DreamCondition extends Condition { public class DreamCondition extends Condition {
private final Context mContext; private final Context mContext;
private final DreamManager mDreamManager;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
@@ -39,8 +41,10 @@ public class DreamCondition extends Condition {
}; };
@Inject @Inject
public DreamCondition(Context context) { public DreamCondition(Context context,
DreamManager dreamManager) {
mContext = context; mContext = context;
mDreamManager = dreamManager;
} }
private void processIntent(Intent intent) { private void processIntent(Intent intent) {
@@ -62,8 +66,8 @@ public class DreamCondition extends Condition {
final IntentFilter filter = new IntentFilter(); final IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_DREAMING_STARTED); filter.addAction(Intent.ACTION_DREAMING_STARTED);
filter.addAction(Intent.ACTION_DREAMING_STOPPED); filter.addAction(Intent.ACTION_DREAMING_STOPPED);
final Intent stickyIntent = mContext.registerReceiver(mReceiver, filter); mContext.registerReceiver(mReceiver, filter);
processIntent(stickyIntent); updateCondition(mDreamManager.isDreaming());
} }
@Override @Override

33
packages/SystemUI/tests/src/com/android/systemui/dreams/conditions/DreamConditionTest.java
View File

@@ -21,9 +21,11 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.DreamManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -50,6 +52,9 @@ public class DreamConditionTest extends SysuiTestCase {
@Mock @Mock
Condition.Callback mCallback; Condition.Callback mCallback;
@Mock
DreamManager mDreamManager;
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
@@ -59,29 +64,39 @@ public class DreamConditionTest extends SysuiTestCase {
* Ensure a dreaming state immediately triggers the condition. * Ensure a dreaming state immediately triggers the condition.
*/ */
@Test @Test
public void testInitialState() { public void testInitialDreamingState() {
final Intent intent = new Intent(Intent.ACTION_DREAMING_STARTED); when(mDreamManager.isDreaming()).thenReturn(true);
when(mContext.registerReceiver(any(), any())).thenReturn(intent); final DreamCondition condition = new DreamCondition(mContext, mDreamManager);
final DreamCondition condition = new DreamCondition(mContext);
condition.addCallback(mCallback); condition.addCallback(mCallback);
condition.start();
verify(mCallback).onConditionChanged(eq(condition)); verify(mCallback).onConditionChanged(eq(condition));
assertThat(condition.isConditionMet()).isTrue(); assertThat(condition.isConditionMet()).isTrue();
} }
/**
* Ensure a non-dreaming state does not trigger the condition.
*/
@Test
public void testInitialNonDreamingState() {
when(mDreamManager.isDreaming()).thenReturn(false);
final DreamCondition condition = new DreamCondition(mContext, mDreamManager);
condition.addCallback(mCallback);
verify(mCallback, never()).onConditionChanged(eq(condition));
assertThat(condition.isConditionMet()).isFalse();
}
/** /**
* Ensure that changing dream state triggers condition. * Ensure that changing dream state triggers condition.
*/ */
@Test @Test
public void testChange() { public void testChange() {
final Intent intent = new Intent(Intent.ACTION_DREAMING_STARTED);
final ArgumentCaptor<BroadcastReceiver> receiverCaptor = final ArgumentCaptor<BroadcastReceiver> receiverCaptor =
ArgumentCaptor.forClass(BroadcastReceiver.class); ArgumentCaptor.forClass(BroadcastReceiver.class);
when(mContext.registerReceiver(receiverCaptor.capture(), any())).thenReturn(intent); when(mDreamManager.isDreaming()).thenReturn(true);
final DreamCondition condition = new DreamCondition(mContext); final DreamCondition condition = new DreamCondition(mContext, mDreamManager);
condition.addCallback(mCallback); condition.addCallback(mCallback);
condition.start(); verify(mContext).registerReceiver(receiverCaptor.capture(), any());
clearInvocations(mCallback); clearInvocations(mCallback);
receiverCaptor.getValue().onReceive(mContext, new Intent(Intent.ACTION_DREAMING_STOPPED)); receiverCaptor.getValue().onReceive(mContext, new Intent(Intent.ACTION_DREAMING_STOPPED));
verify(mCallback).onConditionChanged(eq(condition)); verify(mCallback).onConditionChanged(eq(condition));