diff options
| author | Winson Chung <winsonc@google.com> | 2014-12-04 21:18:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 21:18:01 +0000 |
| commit | 1c88fc009fb3f7a3b5f085abb6a40cf4d845d662 (patch) | |
| tree | 6ad8f619c8fffa90d271fdc97e910e5a15826f15 | |
| parent | d205d407b44b3218579401be4960eda79ce32f67 (diff) | |
| parent | 4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8 (diff) | |
| download | frameworks_base-1c88fc009fb3f7a3b5f085abb6a40cf4d845d662.zip frameworks_base-1c88fc009fb3f7a3b5f085abb6a40cf4d845d662.tar.gz frameworks_base-1c88fc009fb3f7a3b5f085abb6a40cf4d845d662.tar.bz2 | |
am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
* commit '4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8':
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)
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/AppTransition.java | 2 |
2 files changed, 5 insertions, 4 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 2623db3..33a36f6 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; } diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index f6e8bcf..c0d54e1 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; |