summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2013-05-09 18:28:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-05-09 18:28:42 +0000
commitffe3b5b89fa58f7b12a2fc690c89480fc16a9fd6 (patch)
treee4220c94692f6c8c16fe9496ae2de760ba896376
parentbee78812d0b3fc3d877ed0d954a0bb21ab7f2f3b (diff)
parentb10d885c3bb9d634c1c21178319fdf1c04c16bc3 (diff)
Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev
-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 f526f0c6f988..5620e1b35ab4 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