summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2013-05-09 14:19:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-09 14:19:48 -0700
commit203a91a6cae0e3272e9b3becefc862d2c8a72e10 (patch)
tree073535f22ce08036dafab46c809f85ed8f0499c5 /packages
parent0c8c0add4e552fe910d787c2aa9253749b1c7b48 (diff)
parentabd37bcfac84ff85dbcd719d27b014a6eb01d5e0 (diff)
downloadframeworks_base-203a91a6cae0e3272e9b3becefc862d2c8a72e10.zip
frameworks_base-203a91a6cae0e3272e9b3becefc862d2c8a72e10.tar.gz
frameworks_base-203a91a6cae0e3272e9b3becefc862d2c8a72e10.tar.bz2
am abd37bcf: am ffe3b5b8: Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev
* commit 'abd37bcfac84ff85dbcd719d27b014a6eb01d5e0': Exempt the notification panel from animation lockout.
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
index f526f0c..5620e1b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -24,6 +24,7 @@ import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewRootImpl;
import android.widget.FrameLayout;
import android.widget.ScrollView;
import android.widget.TextSwitcher;
@@ -63,6 +64,13 @@ public class StatusBarWindowView extends FrameLayout
mExpandHelper = new ExpandHelper(mContext, latestItems, minHeight, maxHeight);
mExpandHelper.setEventSource(this);
mExpandHelper.setScrollView(mScrollView);
+
+ // We really need to be able to animate while window animations are going on
+ // so that activities may be started asynchronously from panel animations
+ final ViewRootImpl root = getViewRootImpl();
+ if (root != null) {
+ root.setDrawDuringWindowsAnimating(true);
+ }
}
@Override