From fc33cdf71dc58652cb15b7d2f1143affff404fc9 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 3 Dec 2014 13:16:48 -0800 Subject: [PATCH 1/2] Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776) --- .../com/android/systemui/recents/views/TaskStackView.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 2623db3d918ce..33a36f664cf32 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -530,11 +530,12 @@ 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); - tv.unsetFocusedTask(); + if (tv != null) { + tv.unsetFocusedTask(); + } } mFocusedTaskIndex = -1; } From b255e49fe4cab9cae912714a009860c5c1993b33 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 3 Dec 2014 13:45:36 -0800 Subject: [PATCH 2/2] Ensuring that the alpha and translation animation durations are the same. (Bug 18609321) --- services/core/java/com/android/server/wm/AppTransition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index f6e8bcf0c3d8b..c0d54e16ee91a 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -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;