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

Merge "Toggling Recents from home should actually toggle Recents instead of launching the first task."

Browse Source
This commit is contained in:
Winson Chung
2014-06-19 01:23:47 +00:00
committed by Android (Google) Code Review
parent 88dc8f1e41 1f76132d4d
commit 47d1206fb8
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
View File

@@ -277,13 +277,21 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
!mFullScreenshotView.cancelAnimateOnEnterRecents(mFinishRunnable)) {
// If we have a focused task, then launch that task
if (!mRecentsView.launchFocusedTask()) {
// If there are any tasks, then launch the first task
if (!mRecentsView.launchFirstTask()) {
// We really shouldn't hit this, but if we do, just animate out (aka. finish)
if (mConfig.launchedFromHome) {
// Just start the animation out of recents
ReferenceCountedTrigger exitTrigger = new ReferenceCountedTrigger(this,
null, mFinishRunnable, null);
mRecentsView.startExitToHomeAnimation(
new ViewAnimation.TaskViewExitContext(exitTrigger));
} else {
// Otherwise, try and launch the first task
if (!mRecentsView.launchFirstTask()) {
// If there are no tasks, then just finish recents
ReferenceCountedTrigger exitTrigger = new ReferenceCountedTrigger(this,
null, mFinishRunnable, null);
mRecentsView.startExitToHomeAnimation(
new ViewAnimation.TaskViewExitContext(exitTrigger));
}
}
}
}