Merge "Update the animation when showing / closing inline controls" into nyc-dev

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 9bd645d,528fb3d..d0358f4
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@@ -1044,12 -1054,12 +1054,12 @@@ public abstract class BaseStatusBar ext
  
                  MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTE_CONTROLS);
  
 -                // ensure that it's layouted but not visible until actually laid out
 +                // ensure that it's laid but not visible until actually laid out
                  guts.setVisibility(View.INVISIBLE);
 -                // Post to ensure the the guts are properly layed out.
 +                // Post to ensure the the guts are properly laid out.
                  guts.post(new Runnable() {
                      public void run() {
-                         dismissPopups();
+                         dismissPopups(-1 /* x */, -1 /* y */, false /* resetGear */);
                          guts.setVisibility(View.VISIBLE);
                          final double horz = Math.max(guts.getWidth() - x, x);
                          final double vert = Math.max(guts.getHeight() - y, y);

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
Simple merge