Merge "Work on issue #6579997: Mariner entrance animation" into jb-dev

diff --cc packages/SystemUI/src/com/android/systemui/SearchPanelView.java
index 1cd8d50,29cf996..8b8a814
--- 1/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
--- 2/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java
@@@ -46,12 -46,10 +46,12 @@@ import com.android.systemui.statusbar.t
  import com.android.systemui.statusbar.tablet.TabletStatusBar;
  
  public class SearchPanelView extends FrameLayout implements
-         StatusBarPanel {
-     private static final int SEARCH_PANEL_HOLD_DURATION = 500;
+         StatusBarPanel, ActivityOptions.OnAnimationStartedListener {
+     private static final int SEARCH_PANEL_HOLD_DURATION = 0;
      static final String TAG = "SearchPanelView";
      static final boolean DEBUG = TabletStatusBar.DEBUG || PhoneStatusBar.DEBUG || false;
 +    private static final String ASSIST_ICON_METADATA_NAME =
 +            "com.android.systemui.action_assist_icon";
      private final Context mContext;
      private BaseStatusBar mBar;
      private StatusBarTouchProxy mStatusBarTouchProxy;

diff --cc services/java/com/android/server/wm/WindowManagerService.java
Simple merge