summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-06-03 16:24:04 -0700
committerWinson Chung <winsonc@google.com>2014-06-12 12:57:56 -0700
commitd42a6cfe2bf632222617450a1ed340268e82f06c (patch)
treeae2aaf137b4c3420458905182df4db7884a529f7 /policy/src
parent88b00784684d7b706c7b0c4e833b1d67d73358b9 (diff)
downloadframeworks_base-d42a6cfe2bf632222617450a1ed340268e82f06c.zip
frameworks_base-d42a6cfe2bf632222617450a1ed340268e82f06c.tar.gz
frameworks_base-d42a6cfe2bf632222617450a1ed340268e82f06c.tar.bz2
Exploring transitions to/from Recents.
- refactored hwlayers and change view property animations to use a reference counted trigger - cleaned up RecentsConfiguration, and move it into classes using it - moved task bar animations back into TaskBarView - refactoring enter/exit animations to use an animation context Change-Id: Ia66b622b094f22145c2fab07c2a9bdfd62344be2
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 03d29c0..cacf66b 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -296,6 +296,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
WindowState mLastInputMethodWindow = null;
WindowState mLastInputMethodTargetWindow = null;
+ boolean mRecentsVisible;
int mRecentAppsHeldModifiers;
boolean mLanguageSwitchKeyPressed;
@@ -2632,6 +2633,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
});
+ } else if (mRecentsVisible) {
+ // Recents is started on top of Home, so when we launch home while recents is open, let
+ // it do its own animation and then finish itself
+ sendCloseSystemWindows(SYSTEM_DIALOG_REASON_HOME_KEY);
+ hideRecentApps(false);
} else {
// no keyguard stuff to worry about, just launch home!
try {
@@ -2723,6 +2729,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
public int adjustSystemUiVisibilityLw(int visibility) {
mStatusBarController.adjustSystemUiVisibilityLw(mLastSystemUiFlags, visibility);
mNavigationBarController.adjustSystemUiVisibilityLw(mLastSystemUiFlags, visibility);
+ mRecentsVisible = (visibility & View.RECENT_APPS_VISIBLE) > 0;
// Reset any bits in mForceClearingStatusBarVisibility that
// are now clear.