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

Commit 5d35b865 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Switch to public API for surface view when rendering preview" into ub-launcher3-master

parents 071af14f bb353d37

quickstep/src/com/android/launcher3/uioverrides/PreviewSurfaceRenderer.java

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.

 */



package com.android.launcher3.uioverrides;



import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;



import android.content.Context;

import android.os.Bundle;

import android.util.Size;

import android.view.View;



import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.graphics.LauncherPreviewRenderer;

import com.android.systemui.shared.system.SurfaceViewRequestReceiver;



/** Render preview using surface view. */

public class PreviewSurfaceRenderer {



    /** Handle a received surface view request. */

    public static void render(Context context, Bundle bundle) {

        String gridName = bundle.getString("name");

        bundle.remove("name");

        if (gridName == null) {

            gridName = InvariantDeviceProfile.getCurrentGridName(context);

        }

        final InvariantDeviceProfile idp = new InvariantDeviceProfile(context, gridName);



        MAIN_EXECUTOR.execute(() -> {

            View view = new LauncherPreviewRenderer(context, idp).getRenderedView();

            new SurfaceViewRequestReceiver().onReceive(context, bundle, view,

                    new Size(view.getMeasuredWidth(), view.getMeasuredHeight()));

        });

    }

}

src/com/android/launcher3/graphics/GridOptionsProvider.java

+2 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.util.Xml; 
import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.InvariantDeviceProfile.GridOption;

import com.android.launcher3.R;

import com.android.launcher3.uioverrides.PreviewSurfaceRenderer;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -206,7 +205,6 @@ public class GridOptionsProvider extends ContentProvider { 
            return null;

        }



        PreviewSurfaceRenderer.render(getContext(), extras);

        return null;

        return new PreviewSurfaceRenderer(getContext(), extras).render();

    }

}

src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java

0 → 100644
+128 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.

 */



package com.android.launcher3.graphics;



import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;



import android.content.Context;

import android.hardware.display.DisplayManager;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.view.Display;

import android.view.SurfaceControlViewHost;

import android.view.View;



import com.android.launcher3.InvariantDeviceProfile;



import java.util.concurrent.TimeUnit;



/** Render preview using surface view. */

public class PreviewSurfaceRenderer implements IBinder.DeathRecipient {



    private static final String KEY_HOST_TOKEN = "host_token";

    private static final String KEY_VIEW_WIDTH = "width";

    private static final String KEY_VIEW_HEIGHT = "height";

    private static final String KEY_DISPLAY_ID = "display_id";

    private static final String KEY_SURFACE_PACKAGE = "surface_package";

    private static final String KEY_CALLBACK = "callback";



    private final Context mContext;

    private final InvariantDeviceProfile mIdp;

    private final IBinder mHostToken;

    private final int mWidth;

    private final int mHeight;

    private final Display mDisplay;



    private SurfaceControlViewHost mSurfaceControlViewHost;



    PreviewSurfaceRenderer(Context context, Bundle bundle) {

        mContext = context;



        String gridName = bundle.getString("name");

        bundle.remove("name");

        if (gridName == null) {

            gridName = InvariantDeviceProfile.getCurrentGridName(context);

        }

        mIdp = new InvariantDeviceProfile(context, gridName);



        mHostToken = bundle.getBinder(KEY_HOST_TOKEN);

        mWidth = bundle.getInt(KEY_VIEW_WIDTH);

        mHeight = bundle.getInt(KEY_VIEW_HEIGHT);



        final DisplayManager displayManager = (DisplayManager) context.getSystemService(

                Context.DISPLAY_SERVICE);

        mDisplay = displayManager.getDisplay(bundle.getInt(KEY_DISPLAY_ID));

    }



    /** Handle a received surface view request. */

    Bundle render() {

        if (mSurfaceControlViewHost != null) {

            binderDied();

        }



        try {

            mSurfaceControlViewHost = MAIN_EXECUTOR

                    .submit(() -> new SurfaceControlViewHost(mContext, mDisplay, mHostToken))

                    .get(5, TimeUnit.SECONDS);

            mHostToken.linkToDeath(this, 0);

        } catch (Exception e) {

            e.printStackTrace();

            return null;

        }



        MAIN_EXECUTOR.execute(() -> {

            View view = new LauncherPreviewRenderer(mContext, mIdp).getRenderedView();

            // This aspect scales the view to fit in the surface and centers it

            final float scale = Math.min(mWidth / (float) view.getMeasuredWidth(),

                    mHeight / (float) view.getMeasuredHeight());

            view.setScaleX(scale);

            view.setScaleY(scale);

            view.setPivotX(0);

            view.setPivotY(0);

            view.setTranslationX((mWidth - scale * view.getWidth()) / 2);

            view.setTranslationY((mHeight - scale * view.getHeight()) / 2);

            mSurfaceControlViewHost.setView(view, view.getMeasuredWidth(),

                    view.getMeasuredHeight());

        });



        Bundle result = new Bundle();

        result.putParcelable(KEY_SURFACE_PACKAGE, mSurfaceControlViewHost.getSurfacePackage());



        Handler handler = new Handler(Looper.getMainLooper(), Loopermessage -> {

            binderDied();

            return true;

        });

        Messenger messenger = new Messenger(handler);

        Message msg = Message.obtain();

        msg.replyTo = messenger;

        result.putParcelable(KEY_CALLBACK, msg);

        return result;

    }



    @Override

    public void binderDied() {

        if (mSurfaceControlViewHost != null) {

            mSurfaceControlViewHost.release();

            mSurfaceControlViewHost = null;

        }

        mHostToken.unlinkToDeath(this, 0);

    }

}