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

Commit 532c5a42 authored by wilsonshih's avatar wilsonshih
Browse files

Delete the delay for keeping tasksnapshot on screen. 

Tasksnapshot window can block touch event so user may not able
to touch the screen after showing task snapshot. Remove the delay
so app window can response touch event as soon as possible.

Bug: 187227846
Test: atest TaskSnapshotWindowTest
Change-Id: I5fb0fa3a1e6a5e6210d3baf400a84c5892bd2e34
parent 4d225a0e

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java

+3 −25
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.startingsurface;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.graphics.Color.WHITE;

import static android.graphics.Color.alpha;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
@@ -63,7 +62,6 @@ import android.graphics.RectF; 
import android.hardware.HardwareBuffer;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.Trace;

import android.util.MergedConfiguration;

import android.util.Slog;
@@ -94,9 +92,6 @@ import com.android.wm.shell.common.ShellExecutor; 
 * @hide

 */

public class TaskSnapshotWindow {



    private static final long SIZE_MISMATCH_MINIMUM_TIME_MS = 450;



    /**

     * When creating the starting window, we use the exact same layout flags such that we end up

     * with a window with the exact same dimensions etc. However, these flags are not used in layout
@@ -136,10 +131,8 @@ public class TaskSnapshotWindow { 
    private final RectF mTmpDstFrame = new RectF();

    private final CharSequence mTitle;

    private boolean mHasDrawn;

    private long mShownTime;

    private boolean mSizeMismatch;

    private final Paint mBackgroundPaint = new Paint();

    private final int mActivityType;

    private final int mStatusBarColor;

    private final SystemBarBackgroundPainter mSystemBarBackgroundPainter;

    private final int mOrientationOnCreation;
@@ -195,8 +188,6 @@ public class TaskSnapshotWindow { 
        final Point taskSize = snapshot.getTaskSize();

        final Rect taskBounds = new Rect(0, 0, taskSize.x, taskSize.y);

        final int orientation = snapshot.getOrientation();



        final int activityType = runningTaskInfo.topActivityType;

        final int displayId = runningTaskInfo.displayId;



        final IWindowSession session = WindowManagerGlobal.getWindowSession();
@@ -216,7 +207,7 @@ public class TaskSnapshotWindow { 


        final TaskSnapshotWindow snapshotSurface = new TaskSnapshotWindow(

                surfaceControl, snapshot, layoutParams.getTitle(), taskDescription, appearance,

                windowFlags, windowPrivateFlags, taskBounds, orientation, activityType,

                windowFlags, windowPrivateFlags, taskBounds, orientation,

                topWindowInsetsState, clearWindowHandler, mainExecutor);

        final Window window = snapshotSurface.mWindow;
@@ -256,8 +247,8 @@ public class TaskSnapshotWindow { 
    public TaskSnapshotWindow(SurfaceControl surfaceControl,

            TaskSnapshot snapshot, CharSequence title, TaskDescription taskDescription,

            int appearance, int windowFlags, int windowPrivateFlags, Rect taskBounds,

            int currentOrientation, int activityType, InsetsState topWindowInsetsState,

            Runnable clearWindowHandler, ShellExecutor splashScreenExecutor) {

            int currentOrientation, InsetsState topWindowInsetsState, Runnable clearWindowHandler,

            ShellExecutor splashScreenExecutor) {

        mSplashScreenExecutor = splashScreenExecutor;

        mSession = WindowManagerGlobal.getWindowSession();

        mWindow = new Window();
@@ -272,7 +263,6 @@ public class TaskSnapshotWindow { 
                windowPrivateFlags, appearance, taskDescription, 1f, topWindowInsetsState);

        mStatusBarColor = taskDescription.getStatusBarColor();

        mOrientationOnCreation = currentOrientation;

        mActivityType = activityType;

        mTransaction = new SurfaceControl.Transaction();

        mClearWindowHandler = clearWindowHandler;

    }
@@ -295,17 +285,6 @@ public class TaskSnapshotWindow { 
    }



    void remove() {

        final long now = SystemClock.uptimeMillis();

        if (mSizeMismatch && now - mShownTime < SIZE_MISMATCH_MINIMUM_TIME_MS

                // Show the latest content as soon as possible for unlocking to home.

                && mActivityType != ACTIVITY_TYPE_HOME) {

            final long delayTime = mShownTime + SIZE_MISMATCH_MINIMUM_TIME_MS - now;

            mSplashScreenExecutor.executeDelayed(() -> remove(), delayTime);

            if (DEBUG) {

                Slog.d(TAG, "Defer removing snapshot surface in " + delayTime);

            }

            return;

        }

        try {

            if (DEBUG) {

                Slog.d(TAG, "Removing snapshot surface, mHasDrawn: " + mHasDrawn);
@@ -346,7 +325,6 @@ public class TaskSnapshotWindow { 
        } else {

            drawSizeMatchSnapshot();

        }

        mShownTime = SystemClock.uptimeMillis();

        mHasDrawn = true;

        reportDrawn();

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/TaskSnapshotWindowTest.java

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.startingsurface;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.content.res.Configuration.ORIENTATION_PORTRAIT;

import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
@@ -82,7 +81,7 @@ public class TaskSnapshotWindowTest { 
        mWindow = new TaskSnapshotWindow(new SurfaceControl(), snapshot, "Test",

                createTaskDescription(Color.WHITE, Color.RED, Color.BLUE),

                0 /* appearance */, windowFlags /* windowFlags */, 0 /* privateWindowFlags */,

                taskBounds, ORIENTATION_PORTRAIT, ACTIVITY_TYPE_STANDARD, new InsetsState(),

                taskBounds, ORIENTATION_PORTRAIT, new InsetsState(),

                null /* clearWindow */, new TestShellExecutor());

    }