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

Commit d63af8ee authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Polish non-main app window flashing under starting window." into main

parents 459fdbc3 c84dca14

core/java/android/window/SnapshotDrawerUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.graphics.Color.alpha; 
import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;

import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;

import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND;

import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;

import static android.view.WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES;

import static android.view.WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE;
@@ -93,7 +94,8 @@ public class SnapshotDrawerUtils { 
            | FLAG_WATCH_OUTSIDE_TOUCH

            | FLAG_SPLIT_TOUCH

            | FLAG_SCALED

            | FLAG_SECURE;

            | FLAG_SECURE

            | FLAG_DIM_BEHIND;



    private static final RectF sTmpSnapshotSize = new RectF();

    private static final RectF sTmpDstFrame = new RectF();

services/core/java/com/android/server/wm/WindowStateAnimator.java

+4 −0
Original line number Diff line number Diff line
@@ -499,6 +499,10 @@ class WindowStateAnimator { 
    }



    void applyEnterAnimationLocked() {

        if (mWin.mActivityRecord != null && mWin.mActivityRecord.hasStartingWindow()) {

            // It's unnecessary to play enter animation below starting window.

            return;

        }

        final int transit;

        if (mEnterAnimationPending) {

            mEnterAnimationPending = false;