Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57778a27 authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

[LivePicker 3/n] Incorporate LivePreviewFragment 

Don't always use ImagePreviewFragment

Bug: 141391722
Change-Id: I4baa569d354dd5815fcc93972cfd7a9e1bc845d8
parent 81b6b649

res/drawable/ic_delete_24px.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

     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>

src/com/android/customization/module/DefaultCustomizationInjector.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.wallpaper.module.WallpaperPreferences; 
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 @@ public class DefaultCustomizationInjector extends BaseWallpaperInjector 
            WallpaperInfo wallpaperInfo,

            int mode,

            boolean testingModeEnabled) {

        return ImagePreviewFragment.newInstance(wallpaperInfo, mode, testingModeEnabled);

        return PreviewFragment.newInstance(wallpaperInfo, mode, testingModeEnabled);

    }



    @Override