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

Commit e2a98cd8 authored by Winson's avatar Winson Committed by android-build-merger
Browse files

Merge changes Ie59ed72c,Ie763a2a6,I7f830e5c,Ife637438 into nyc-dev am: fe1886f8 

am: 843fcb07

* commit '843fcb07':
  Should not update initial state at all on resize.
  Adding logging to track down bitmap issues.
  Moving the background to the window.
  Adding clear-all button.

Change-Id: I27ed2e95a43b77e45aa15a7ae1de9c54c4a0d78e
parents f303f047 843fcb07

core/java/com/android/internal/policy/DecorView.java

+13 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    private Drawable mResizingBackgroundDrawable;

    private Drawable mCaptionBackgroundDrawable;

    private Drawable mUserCaptionBackgroundDrawable;

    private Drawable mOriginalBackgroundDrawable;



    private float mAvailableWidth;
@@ -888,6 +889,11 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
                mBackgroundPadding.setEmpty();

            }

            drawableChanged();



            // Make sure we don't reset to the old drawable when finishing resizing.

            if (mResizeMode != RESIZE_MODE_INVALID) {

                mOriginalBackgroundDrawable = null;

            }

        }

    }
@@ -1950,6 +1956,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
            updateElevation();



            updateColorViews(null /* insets */, false);



            mOriginalBackgroundDrawable = getBackground();

            setBackgroundDrawable(null);

        }

        mResizeMode = resizeMode;

        getViewRootImpl().requestInvalidateRootRenderNode();
@@ -1961,6 +1970,10 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        updateColorViews(null /* insets */, false);

        mResizeMode = RESIZE_MODE_INVALID;

        getViewRootImpl().requestInvalidateRootRenderNode();

        if (mOriginalBackgroundDrawable != null) {

            setBackgroundDrawable(mOriginalBackgroundDrawable);

            mOriginalBackgroundDrawable = null;

        }

    }



    @Override

packages/SystemUI/res/layout/recents_stack_action_button.xml

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
    android:textSize="14sp"

    android:textColor="#FFFFFF"

    android:textAllCaps="true"

    android:drawableStart="@drawable/ic_history"

    android:drawablePadding="6dp"

    android:shadowColor="#99000000"

    android:shadowDx="0"

    android:shadowDy="2"

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ 
    <!-- The animation duration for animating the removal of a task view. -->

    <integer name="recents_animate_task_view_remove_duration">175</integer>



    <!-- The base animation duration for animating the removal of all task views. -->

    <integer name="recents_animate_task_views_remove_all_duration">300</integer>



    <!-- The animation duration for scrolling the stack to a particular item. -->

    <integer name="recents_animate_task_stack_scroll_duration">200</integer>

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -574,10 +574,12 @@ 
    <dimen name="recents_layout_bottom_margin">16dp</dimen>

    <dimen name="recents_layout_side_margin_phone">16dp</dimen>

    <dimen name="recents_layout_side_margin_tablet">48dp</dimen>

    <dimen name="recents_layout_side_margin_tablet_docked">16dp</dimen>

    <dimen name="recents_layout_side_margin_tablet_xlarge">64dp</dimen>

    <dimen name="recents_layout_side_margin_tablet_xlarge_docked">16dp</dimen>



    <!-- The height between the top margin and the top of the focused task. -->

    <dimen name="recents_layout_top_peek_size">56dp</dimen>

    <dimen name="recents_layout_top_peek_size">48dp</dimen>

    <!-- The height between the bottom margin and the top of task in front of the focused task. -->

    <dimen name="recents_layout_bottom_peek_size">56dp</dimen>

packages/SystemUI/src/com/android/systemui/Interpolators.java

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui;



import android.view.animation.AccelerateDecelerateInterpolator;

import android.view.animation.AccelerateInterpolator;

import android.view.animation.DecelerateInterpolator;

import android.view.animation.Interpolator;

import android.view.animation.LinearInterpolator;
@@ -32,6 +33,7 @@ public class Interpolators { 
    public static final Interpolator ALPHA_IN = new PathInterpolator(0.4f, 0f, 1f, 1f);

    public static final Interpolator ALPHA_OUT = new PathInterpolator(0f, 0f, 0.8f, 1f);

    public static final Interpolator LINEAR = new LinearInterpolator();

    public static final Interpolator ACCELERATE = new AccelerateInterpolator();

    public static final Interpolator ACCELERATE_DECELERATE = new AccelerateDecelerateInterpolator();

    public static final Interpolator DECELERATE_QUINT = new DecelerateInterpolator(2.5f);