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

Commit b18c6132 authored by chihhangchuang's avatar chihhangchuang
Browse files

Get rid of setZOrderOnTop for theme preview 

To make the usage of warkspace and wallpaper surfaceview consistent in the app.

Test: Manually
Bug: 156321486
Change-Id: I66466d5b9f8797204842538fc4dd9b90a3be86e7
parent c862c981

res/layout/grid_preview_card.xml

+4 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ 
    android:layout_height="match_parent"

    android:layout_gravity="center">



    <FrameLayout

        android:id="@+id/grid_preview_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/primary_color" />



    <ImageView

        android:id="@+id/wallpaper_preview_image"

        android:layout_width="match_parent"
@@ -38,4 +32,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <FrameLayout

        android:id="@+id/grid_preview_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

</androidx.cardview.widget.CardView>
 
 No newline at end of file

src/com/android/customization/picker/grid/GridOptionPreviewer.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class GridOptionPreviewer { 
        if (usesSurfaceView) {

            mGridOptionSurface = new SurfaceView(mContext);

            setUpView(mGridOptionSurface);

            mGridOptionSurface.setZOrderOnTop(true);

            mGridOptionSurface.setZOrderMediaOverlay(true);

            mGridOptionSurface.getHolder().addCallback(mSurfaceCallback);

        } else {

            final ImageView previewImage = new ImageView(mContext);