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

Commit e1a96f7f authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 1c88fc00: am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 

* commit '1c88fc00':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
parents 1568aa6c 1c88fc00

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

+4 −3
Original line number Diff line number Diff line
@@ -530,12 +530,13 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 


    /** Resets the focused task. */

    void resetFocusedTask() {

        if ((mStack != null) && (0 <= mFocusedTaskIndex) &&

                (mFocusedTaskIndex < mStack.getTaskCount())) {

        if ((0 <= mFocusedTaskIndex) && (mFocusedTaskIndex < mStack.getTaskCount())) {

            Task t = mStack.getTasks().get(mFocusedTaskIndex);

            TaskView tv = getChildViewForTask(t);

            if (tv != null) {

                tv.unsetFocusedTask();

            }

        }

        mFocusedTaskIndex = -1;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class AppTransition implements Dump { 
    private static final float RECENTS_THUMBNAIL_FADEOUT_FRACTION = 0.3f;



    private static final int DEFAULT_APP_TRANSITION_DURATION = 250;

    private static final int THUMBNAIL_APP_TRANSITION_DURATION = 300;

    private static final int THUMBNAIL_APP_TRANSITION_DURATION = 325;

    private static final int THUMBNAIL_APP_TRANSITION_ALPHA_DURATION = 325;



    private final Context mContext;