Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev

Browse Source 
* commit 'ba1307b2b42b60893c88622f41f99efa2356350d':
  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)
This commit is contained in:
Winson Chung
2014-12-04 15:15:21 +00:00
committed by Android Git Automerger
parent f2b934b42b ba1307b2b4
commit 4eb896ef01
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -530,11 +530,12 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
/** Resets the focused task. */ /** Resets the focused task. */
void resetFocusedTask() { void resetFocusedTask() {
if ((mStack != null) && (0 <= mFocusedTaskIndex) && if ((0 <= mFocusedTaskIndex) && (mFocusedTaskIndex < mStack.getTaskCount())) {
(mFocusedTaskIndex < mStack.getTaskCount())) {
Task t = mStack.getTasks().get(mFocusedTaskIndex); Task t = mStack.getTasks().get(mFocusedTaskIndex);
TaskView tv = getChildViewForTask(t); TaskView tv = getChildViewForTask(t);
tv.unsetFocusedTask(); if (tv != null) {
tv.unsetFocusedTask();
}
} }
mFocusedTaskIndex = -1; mFocusedTaskIndex = -1;
} }

2
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -118,7 +118,7 @@ public class AppTransition implements Dump {
private static final float RECENTS_THUMBNAIL_FADEOUT_FRACTION = 0.3f; private static final float RECENTS_THUMBNAIL_FADEOUT_FRACTION = 0.3f;
private static final int DEFAULT_APP_TRANSITION_DURATION = 250; 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 static final int THUMBNAIL_APP_TRANSITION_ALPHA_DURATION = 325;
private final Context mContext; private final Context mContext;