Revert "Fix jank when switching themes"

This reverts commit e5d0b9dddbcd8e6be7725a89b82fb990db2dade7.

Fixes crashloop with lock pattern

Change-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07
Fixes: 63980375

1 files changed, 7 insertions, 26 deletions

diff --git a/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java b/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
index cb6a83d2644b..0060901578cd 100644
--- a/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
+++ b/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
@@ -16,14 +16,12 @@
 package com.android.internal.colorextraction;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import android.app.WallpaperColors;
 import android.app.WallpaperManager;
 import android.content.Context;
 import android.graphics.Color;
@@ -31,6 +29,7 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import com.android.internal.colorextraction.ColorExtractor;
 import com.android.internal.colorextraction.ColorExtractor.GradientColors;
 import com.android.internal.colorextraction.types.ExtractionType;
 import com.android.internal.colorextraction.types.Tonal;
@@ -79,10 +78,10 @@ public class ColorExtractorTest {
         ExtractionType type =
                 (inWallpaperColors, outGradientColorsNormal, outGradientColorsDark,
                         outGradientColorsExtraDark) -> {
-                    outGradientColorsNormal.set(colorsExpectedNormal);
-                    outGradientColorsDark.set(colorsExpectedDark);
-                    outGradientColorsExtraDark.set(colorsExpectedExtraDark);
-                };
+            outGradientColorsNormal.set(colorsExpectedNormal);
+            outGradientColorsDark.set(colorsExpectedDark);
+            outGradientColorsExtraDark.set(colorsExpectedExtraDark);
+        };
         ColorExtractor extractor = new ColorExtractor(mContext, type);
 
         GradientColors colors = extractor.getColors(WallpaperManager.FLAG_SYSTEM,
@@ -93,22 +92,4 @@ public class ColorExtractorTest {
         colors = extractor.getColors(WallpaperManager.FLAG_SYSTEM, ColorExtractor.TYPE_EXTRA_DARK);
         assertEquals("Extracted colors not being used!", colors, colorsExpectedExtraDark);
     }
-
-    @Test
-    public void addOnColorsChangedListener_invokesListener() {
-        ColorExtractor.OnColorsChangedListener mockedListeners =
-                mock(ColorExtractor.OnColorsChangedListener.class);
-        ColorExtractor extractor = new ColorExtractor(mContext, new Tonal(mContext));
-        extractor.addOnColorsChangedListener(mockedListeners);
-
-        extractor.onColorsChanged(new WallpaperColors(Color.valueOf(Color.RED), null, null),
-                WallpaperManager.FLAG_LOCK);
-        verify(mockedListeners, times(1)).onColorsChanged(any(),
-                eq(WallpaperManager.FLAG_LOCK));
-
-        extractor.removeOnColorsChangedListener(mockedListeners);
-        extractor.onColorsChanged(new WallpaperColors(Color.valueOf(Color.RED), null, null),
-                WallpaperManager.FLAG_LOCK);
-        verifyNoMoreInteractions(mockedListeners);
-    }
 }