summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSantiago Etchebehere <santie@google.com>2020-04-09 19:17:19 -0700
committerSantiago Etchebehere <santie@google.com>2020-04-09 21:37:05 -0700
commit1754f33a9b136160bb19b5aa5417ea726b4fc1d8 (patch)
treede97e703edb54907d69d70778ac1a3fa6ae70d6f /tests
parent98b05ac24f79e8efa10929b781e60b0c04539465 (diff)
downloadThemePicker-1754f33a9b136160bb19b5aa5417ea726b4fc1d8.tar.gz
Remove support for wallpapers in style bundles
This CL doesn't yet implement the new preview UI, just removes support all the usages and support for wallpaper in theme bundles. Bug: 151868805 Change-Id: I0a7de9ff2150c8f3e516ec49c7c833bab7ac08d1
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/customization/testing/TestCustomizationInjector.java5
-rw-r--r--tests/src/com/android/customization/testing/TestThemeManager.java4
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/src/com/android/customization/testing/TestCustomizationInjector.java b/tests/src/com/android/customization/testing/TestCustomizationInjector.java
index 10b59343..dbbdb74b 100644
--- a/tests/src/com/android/customization/testing/TestCustomizationInjector.java
+++ b/tests/src/com/android/customization/testing/TestCustomizationInjector.java
@@ -13,7 +13,6 @@ import com.android.customization.module.ThemesUserEventLogger;
import com.android.wallpaper.module.DrawableLayerResolver;
import com.android.wallpaper.module.PackageStatusNotifier;
import com.android.wallpaper.module.UserEventLogger;
-import com.android.wallpaper.module.WallpaperSetter;
import com.android.wallpaper.testing.TestInjector;
/**
@@ -38,12 +37,10 @@ public class TestCustomizationInjector extends TestInjector implements Customiza
public ThemeManager getThemeManager(
ThemeBundleProvider provider,
FragmentActivity activity,
- WallpaperSetter wallpaperSetter,
OverlayManagerCompat overlayManagerCompat,
ThemesUserEventLogger logger) {
if (mThemeManager == null) {
- mThemeManager = new TestThemeManager(provider, activity, wallpaperSetter,
- overlayManagerCompat, logger);
+ mThemeManager = new TestThemeManager(provider, activity, overlayManagerCompat, logger);
}
return mThemeManager;
}
diff --git a/tests/src/com/android/customization/testing/TestThemeManager.java b/tests/src/com/android/customization/testing/TestThemeManager.java
index cc8567f1..c4d25fba 100644
--- a/tests/src/com/android/customization/testing/TestThemeManager.java
+++ b/tests/src/com/android/customization/testing/TestThemeManager.java
@@ -6,7 +6,6 @@ import com.android.customization.model.theme.OverlayManagerCompat;
import com.android.customization.model.theme.ThemeBundleProvider;
import com.android.customization.model.theme.ThemeManager;
import com.android.customization.module.ThemesUserEventLogger;
-import com.android.wallpaper.module.WallpaperSetter;
/**
* Test implementation of {@link ThemeManager}.
@@ -18,10 +17,9 @@ public class TestThemeManager extends ThemeManager {
public TestThemeManager(
ThemeBundleProvider provider,
FragmentActivity activity,
- WallpaperSetter wallpaperSetter,
OverlayManagerCompat overlayManagerCompat,
ThemesUserEventLogger logger) {
- super(provider, activity, wallpaperSetter, overlayManagerCompat, logger);
+ super(provider, activity, overlayManagerCompat, logger);
}
@Override