summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-08-21 16:52:55 -0700
committerJorim Jaggi <jjaggi@google.com>2015-08-24 21:49:49 +0000
commitd94d3a2aa5cd1f177f61f73733217c952e356c43 (patch)
treeb86400b1e6a28ac7da7205f3b502a7c8f77cf0a9 /services
parent8a8885b91de361b3a6a975e380e4a00fa92f8d7d (diff)
downloadframeworks_base-d94d3a2aa5cd1f177f61f73733217c952e356c43.zip
frameworks_base-d94d3a2aa5cd1f177f61f73733217c952e356c43.tar.gz
frameworks_base-d94d3a2aa5cd1f177f61f73733217c952e356c43.tar.bz2
Fix issues with light status bar and fp wake-and-unlock
- When wake-and-unlocking, make sure to skip the light status bar transition. - Fix race condition with window manager when unlocking when device is interactive for supplying the timings for the light status bar transition. - Fix media artwork when wake-and-unlocking while pulsing. Bug: 23365544 Change-Id: I209ca1e6684811f5f313354ca1614a0ebd49388c
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/policy/StatusBarController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/StatusBarController.java b/services/core/java/com/android/server/policy/StatusBarController.java
index d1b50da..b1ae922 100644
--- a/services/core/java/com/android/server/policy/StatusBarController.java
+++ b/services/core/java/com/android/server/policy/StatusBarController.java
@@ -72,7 +72,9 @@ public class StatusBarController extends BarController {
if (statusbar != null) {
long startTime = calculateStatusBarTransitionStartTime(openAnimation,
closeAnimation);
- statusbar.appTransitionStarting(startTime, TRANSITION_DURATION);
+ long duration = closeAnimation != null || openAnimation != null
+ ? TRANSITION_DURATION : 0;
+ statusbar.appTransitionStarting(startTime, duration);
}
} catch (RemoteException e) {
Slog.e(mTag, "RemoteException when app transition is starting", e);