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

Commit d45aac43 authored by Winson Chung's avatar Winson Chung
Browse files

Fix issue with resizing background and incorrectly outline. 

- Revert to simple color drawable to ensure that we still see a visible
  outline in Overview while it is resized in split screen. We can't use
  the gradient drawable in this case because both the window background
  and the background in the backdrop frame renderer are visible, which
  would look weird.
- Also use the screen dimensions for both drawables to ensure that we
  get the right outline bounds for the DecorView when the window bg
  bounds change.

Bug: 64645364
Test: Enter split with overview, dismiss docked app and ensure that it
      draws under the nav bar.

Change-Id: I07c885f1148163ff59876f3bd2448655fe5928a1
parent 144d8cb6

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
        });



        // Set the window background

        getWindow().setBackgroundDrawable(mRecentsView.getBackgroundScrim());

        mRecentsView.updateBackgroundScrim(getWindow(), isInMultiWindowMode());



        // Create the home intent runnable

        mHomeIntent = new Intent(Intent.ACTION_MAIN, null);
@@ -556,6 +556,9 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
    public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {

        super.onMultiWindowModeChanged(isInMultiWindowMode);



        // Set the window background

        mRecentsView.updateBackgroundScrim(getWindow(), isInMultiWindowMode);



        reloadTaskStack(isInMultiWindowMode, true /* sendConfigChangedEvent */);

    }

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+32 −10
Original line number Diff line number Diff line
@@ -20,13 +20,17 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; 


import android.animation.Animator;

import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator.AnimatorUpdateListener;

import android.app.ActivityOptions.OnAnimationStartedListener;

import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.util.ArraySet;

import android.util.AttributeSet;
@@ -37,6 +41,7 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.ViewDebug;

import android.view.ViewPropertyAnimator;

import android.view.Window;

import android.view.WindowInsets;

import android.widget.FrameLayout;

import android.widget.TextView;
@@ -117,7 +122,15 @@ public class RecentsView extends FrameLayout { 


    private float mBusynessFactor;

    private GradientDrawable mBackgroundScrim;

    private Animator mBackgroundScrimAnimator;

    private ColorDrawable mMultiWindowBackgroundScrim;

    private ValueAnimator mBackgroundScrimAnimator;

    private Point mTmpDisplaySize = new Point();



    private final AnimatorUpdateListener mUpdateBackgroundScrimAlpha = (animation) -> {

        int alpha = (Integer) animation.getAnimatedValue();

        mBackgroundScrim.setAlpha(alpha);

        mMultiWindowBackgroundScrim.setAlpha(alpha);

    };



    private RecentsTransitionHelper mTransitionHelper;

    @ViewDebug.ExportedProperty(deepExport=true, prefix="touch_")
@@ -146,10 +159,7 @@ public class RecentsView extends FrameLayout { 
        mTouchHandler = new RecentsViewTouchHandler(this);

        mFlingAnimationUtils = new FlingAnimationUtils(context, 0.3f);

        mBackgroundScrim = new GradientDrawable(context);

        mBackgroundScrim.setCallback(this);



        boolean usingDarkText = Color.luminance(

                Utils.getColorAttr(mContext, R.attr.wallpaperTextColor)) < 0.5f;

        mMultiWindowBackgroundScrim = new ColorDrawable();



        LayoutInflater inflater = LayoutInflater.from(context);

        mEmptyView = (TextView) inflater.inflate(R.layout.recents_empty, this, false);
@@ -244,6 +254,7 @@ public class RecentsView extends FrameLayout { 
            } else {

                mBackgroundScrim.setAlpha(0);

            }

            mMultiWindowBackgroundScrim.setAlpha(mBackgroundScrim.getAlpha());

        }

    }
@@ -300,8 +311,14 @@ public class RecentsView extends FrameLayout { 
    /**

     * Returns the window background scrim.

     */

    public Drawable getBackgroundScrim() {

        return mBackgroundScrim;

    public void updateBackgroundScrim(Window window, boolean isInMultiWindow) {

        if (isInMultiWindow) {

            mBackgroundScrim.setCallback(null);

            window.setBackgroundDrawable(mMultiWindowBackgroundScrim);

        } else {

            mMultiWindowBackgroundScrim.setCallback(null);

            window.setBackgroundDrawable(mBackgroundScrim);

        }

    }



    /**
@@ -401,6 +418,9 @@ public class RecentsView extends FrameLayout { 
     */

    public void setScrimColors(ColorExtractor.GradientColors scrimColors, boolean animated) {

        mBackgroundScrim.setColors(scrimColors, animated);

        int alpha = mMultiWindowBackgroundScrim.getAlpha();

        mMultiWindowBackgroundScrim.setColor(scrimColors.getMainColor());

        mMultiWindowBackgroundScrim.setAlpha(alpha);

    }



    @Override
@@ -470,8 +490,10 @@ public class RecentsView extends FrameLayout { 


        // Needs to know the screen size since the gradient never scales up or down

        // even when bounds change.

        mBackgroundScrim.setScreenSize(right - left, bottom - top);

        mContext.getDisplay().getRealSize(mTmpDisplaySize);

        mBackgroundScrim.setScreenSize(mTmpDisplaySize.x, mTmpDisplaySize.y);

        mBackgroundScrim.setBounds(left, top, right, bottom);

        mMultiWindowBackgroundScrim.setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);



        if (RecentsDebugFlags.Static.EnableStackActionButton) {

            // Layout the stack action button such that its drawable is start-aligned with the
@@ -916,12 +938,12 @@ public class RecentsView extends FrameLayout { 
        // Calculate the absolute alpha to animate from

        final int fromAlpha = mBackgroundScrim.getAlpha();

        final int toAlpha = (int) (alpha * 255);

        mBackgroundScrimAnimator = ObjectAnimator.ofInt(mBackgroundScrim, Utilities.DRAWABLE_ALPHA,

                fromAlpha, toAlpha);

        mBackgroundScrimAnimator = ValueAnimator.ofInt(fromAlpha, toAlpha);

        mBackgroundScrimAnimator.setDuration(duration);

        mBackgroundScrimAnimator.setInterpolator(toAlpha > fromAlpha

                ? Interpolators.ALPHA_IN

                : Interpolators.ALPHA_OUT);

        mBackgroundScrimAnimator.addUpdateListener(mUpdateBackgroundScrimAlpha);

        mBackgroundScrimAnimator.start();

    }