Merge "DO NOT MERGE Partial revert of lowlight animations" into tm-qpr-dev

libs/dream/lowlight/src/com/android/dream/lowlight/LowLightDreamManager.java

@@ -72,7 +72,6 @@ public final class LowLightDreamManager {
     public static final int AMBIENT_LIGHT_MODE_LOW_LIGHT = 2;
 
     private final DreamManager mDreamManager;
-    private final LowLightTransitionCoordinator mLowLightTransitionCoordinator;
 
     @Nullable
     private final ComponentName mLowLightDreamComponent;
@@ -82,10 +81,8 @@ public final class LowLightDreamManager {
     @Inject
     public LowLightDreamManager(
             DreamManager dreamManager,
-            LowLightTransitionCoordinator lowLightTransitionCoordinator,
             @Named(LOW_LIGHT_DREAM_COMPONENT) @Nullable ComponentName lowLightDreamComponent) {
         mDreamManager = dreamManager;
-        mLowLightTransitionCoordinator = lowLightTransitionCoordinator;
         mLowLightDreamComponent = lowLightDreamComponent;
     }
 
@@ -115,8 +112,6 @@ public final class LowLightDreamManager {
         mAmbientLightMode = ambientLightMode;
 
         boolean shouldEnterLowLight = mAmbientLightMode == AMBIENT_LIGHT_MODE_LOW_LIGHT;
-        mLowLightTransitionCoordinator.notifyBeforeLowLightTransition(shouldEnterLowLight,
+        mDreamManager.setSystemDreamComponent(shouldEnterLowLight ? mLowLightDreamComponent : null);
-                () -> mDreamManager.setSystemDreamComponent(
-                        shouldEnterLowLight ? mLowLightDreamComponent : null));
     }
 }

libs/dream/lowlight/tests/src/com.android.dream.lowlight/LowLightDreamManagerTest.java

@@ -21,10 +21,7 @@ import static com.android.dream.lowlight.LowLightDreamManager.AMBIENT_LIGHT_MODE
 import static com.android.dream.lowlight.LowLightDreamManager.AMBIENT_LIGHT_MODE_UNKNOWN;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.clearInvocations;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
@@ -46,9 +43,6 @@ public class LowLightDreamManagerTest {
     @Mock
     private DreamManager mDreamManager;
 
-    @Mock
-    private LowLightTransitionCoordinator mTransitionCoordinator;
-
     @Mock
     private ComponentName mDreamComponent;
 
@@ -58,14 +52,7 @@ public class LowLightDreamManagerTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        // Automatically run any provided Runnable to mTransitionCoordinator to simplify testing.
+        mLowLightDreamManager = new LowLightDreamManager(mDreamManager,
-        doAnswer(invocation -> {
-            ((Runnable) invocation.getArgument(1)).run();
-            return null;
-        }).when(mTransitionCoordinator).notifyBeforeLowLightTransition(anyBoolean(),
-                any(Runnable.class));
-
-        mLowLightDreamManager = new LowLightDreamManager(mDreamManager, mTransitionCoordinator,
                 mDreamComponent);
     }
 
@@ -73,7 +60,6 @@ public class LowLightDreamManagerTest {
     public void setAmbientLightMode_lowLight_setSystemDream() {
         mLowLightDreamManager.setAmbientLightMode(AMBIENT_LIGHT_MODE_LOW_LIGHT);
 
-        verify(mTransitionCoordinator).notifyBeforeLowLightTransition(eq(true), any());
         verify(mDreamManager).setSystemDreamComponent(mDreamComponent);
     }
 
@@ -81,7 +67,6 @@ public class LowLightDreamManagerTest {
     public void setAmbientLightMode_regularLight_clearSystemDream() {
         mLowLightDreamManager.setAmbientLightMode(AMBIENT_LIGHT_MODE_REGULAR);
 
-        verify(mTransitionCoordinator).notifyBeforeLowLightTransition(eq(false), any());
         verify(mDreamManager).setSystemDreamComponent(null);
     }
 
@@ -100,7 +85,7 @@ public class LowLightDreamManagerTest {
     @Test
     public void setAmbientLightMode_dreamComponentNotSet_doNothing() {
         final LowLightDreamManager lowLightDreamManager = new LowLightDreamManager(mDreamManager,
-                mTransitionCoordinator, null /*dream component*/);
+                null /*dream component*/);
 
         lowLightDreamManager.setAmbientLightMode(AMBIENT_LIGHT_MODE_LOW_LIGHT);