commit 6c48bd50b92cec3d3d7d5f4d7182979aa5e86d4a
author Santiago Etchebehere <santie@google.com> Mon Mar 29 10:13:38 2021 -0700
committer Santiago Etchebehere <santie@google.com> Thu Apr 08 14:38:14 2021 -0700
tree 9a91923b78aedc0f9878606834d72ad6f8493159
parent 7433b36bbc3ea3d7c822ba2be94ae529f8232674

Update to use the new WallpaperConnection

And get rid of LiveTileOverlay

Bug: 179127643
Test: manual

Change-Id: I6ef28f93a05bf11923891e5648c97da144a5ce26

src/com/android/customization/picker/WallpaperPreviewer.java

diff --git a/src/com/android/customization/picker/WallpaperPreviewer.java b/src/com/android/customization/picker/WallpaperPreviewer.java
index 064ece6..415ca5b 100644
--- a/src/com/android/customization/picker/WallpaperPreviewer.java
+++ b/src/com/android/customization/picker/WallpaperPreviewer.java
@@ -19,7 +19,6 @@
 import android.app.WallpaperColors;
 import android.content.Intent;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.service.wallpaper.WallpaperService;
 import android.view.Surface;
 import android.view.SurfaceView;
@@ -42,7 +41,6 @@
 import com.android.wallpaper.util.WallpaperConnection;
 import com.android.wallpaper.util.WallpaperConnection.WallpaperConnectionListener;
 import com.android.wallpaper.util.WallpaperSurfaceCallback;
-import com.android.wallpaper.widget.LiveTileOverlay;
 import com.android.wallpaper.widget.WallpaperColorsLoader;
 
 /** A class to load the wallpaper to the view. */
@@ -76,7 +74,7 @@
         mWallpaperSurface = wallpaperSurface;
         mWallpaperSurfaceCallback = new WallpaperSurfaceCallback(activity, mHomePreview,
                 mWallpaperSurface, this::setUpWallpaperPreview);
-        mWallpaperSurface.setZOrderMediaOverlay(false);
+        mWallpaperSurface.setZOrderMediaOverlay(true);
         mWallpaperSurface.getHolder().addCallback(mWallpaperSurfaceCallback);
 
         View rootView = homePreview.getRootView();
@@ -118,7 +116,6 @@
     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     @MainThread
     public void onDestroy() {
-        LiveTileOverlay.INSTANCE.detach(mHomePreview.getOverlay());
         if (mWallpaperConnection != null) {
             mWallpaperConnection.disconnect();
             mWallpaperConnection = null;
@@ -157,7 +154,6 @@
                         .loadPreviewImage(mActivity,
                                 renderInImageWallpaperSurface ? homeImageWallpaper : mHomePreview,
                                 mActivity.getResources().getColor(R.color.secondary_color));
-                LiveTileOverlay.INSTANCE.detach(mHomePreview.getOverlay());
                 if (mWallpaper instanceof LiveWallpaperInfo) {
                     mWallpaper.getThumbAsset(mActivity.getApplicationContext())
                             .loadPreviewImage(
@@ -209,16 +205,12 @@
                                 mWallpaperColorsListener.onWallpaperColorsChanged(colors);
                             }
                         }
-                    }, mPreviewGlobalRect);
-
-            LiveTileOverlay.INSTANCE.update(new RectF(mPreviewLocalRect),
-                    ((CardView) mHomePreview.getParent()).getRadius());
+                    }, mWallpaperSurface);
 
             mWallpaperConnection.setVisibility(true);
             mHomePreview.post(() -> {
                 if (mWallpaperConnection != null && !mWallpaperConnection.connect()) {
                     mWallpaperConnection = null;
-                    LiveTileOverlay.INSTANCE.detach(mHomePreview.getOverlay());
                 }
             });
         } else {