[LivePicker 3/n] Incorporate LivePreviewFragment
Don't always use ImagePreviewFragment
Bug: 141391722
Change-Id: I4baa569d354dd5815fcc93972cfd7a9e1bc845d8
diff --git a/res/drawable/ic_delete_24px.xml b/res/drawable/ic_delete_24px.xml
deleted file mode 100644
index bc83f36..0000000
--- a/res/drawable/ic_delete_24px.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
- <path
- android:fillColor="@android:color/white"
- android:pathData="M9,8h2v9h-2z"/>
- <path
- android:fillColor="@android:color/white"
- android:pathData="M13,8h2v9h-2z"/>
-</vector>
diff --git a/src/com/android/customization/module/DefaultCustomizationInjector.java b/src/com/android/customization/module/DefaultCustomizationInjector.java
index 5cee0e8..a0d435b 100644
--- a/src/com/android/customization/module/DefaultCustomizationInjector.java
+++ b/src/com/android/customization/module/DefaultCustomizationInjector.java
@@ -32,7 +32,7 @@
import com.android.wallpaper.module.WallpaperRotationRefresher;
import com.android.wallpaper.module.WallpaperSetter;
import com.android.wallpaper.monitor.PerformanceMonitor;
-import com.android.wallpaper.picker.ImagePreviewFragment;
+import com.android.wallpaper.picker.PreviewFragment;
public class DefaultCustomizationInjector extends BaseWallpaperInjector
implements CustomizationInjector {
@@ -92,7 +92,7 @@
WallpaperInfo wallpaperInfo,
int mode,
boolean testingModeEnabled) {
- return ImagePreviewFragment.newInstance(wallpaperInfo, mode, testingModeEnabled);
+ return PreviewFragment.newInstance(wallpaperInfo, mode, testingModeEnabled);
}
@Override