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

Commit 49c2aacf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Get rid of setZOrderOnTop for theme preview" into ub-launcher3-master

parents 559cf9db b18c6132

res/layout/grid_preview_card.xml

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

    android:layout_height="match_parent"

    android:layout_gravity="center">

    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

    <ImageView

        android:id="@+id/wallpaper_preview_image"

        android:id="@+id/wallpaper_preview_image"

        android:layout_width="match_parent"

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

        android:layout_width="match_parent"

        android:layout_height="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>
 
</androidx.cardview.widget.CardView>
 
 No newline at end of file

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

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

        if (usesSurfaceView) {

            mGridOptionSurface = new SurfaceView(mContext);

            mGridOptionSurface = new SurfaceView(mContext);

            setUpView(mGridOptionSurface);

            setUpView(mGridOptionSurface);

            mGridOptionSurface.setZOrderOnTop(true);

            mGridOptionSurface.setZOrderMediaOverlay(true);

            mGridOptionSurface.getHolder().addCallback(mSurfaceCallback);

            mGridOptionSurface.getHolder().addCallback(mSurfaceCallback);

        } else {

        } else {

            final ImageView previewImage = new ImageView(mContext);

            final ImageView previewImage = new ImageView(mContext);