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

Author: Dianne Hackborn

core/java/android/app/ActivityOptions.java

@@ -127,14 +127,55 @@ public class ActivityOptions {
      */
     public static ActivityOptions makeCustomAnimation(Context context,
             int enterResId, int exitResId) {
+        return makeCustomAnimation(context, enterResId, exitResId, null, null);
+    }
+
+    /**
+     * Create an ActivityOptions specifying a custom animation to run when
+     * the activity is displayed.
+     *
+     * @param context Who is defining this.  This is the application that the
+     * animation resources will be loaded from.
+     * @param enterResId A resource ID of the animation resource to use for
+     * the incoming activity.  Use 0 for no animation.
+     * @param exitResId A resource ID of the animation resource to use for
+     * the outgoing activity.  Use 0 for no animation.
+     * @param handler If <var>listener</var> is non-null this must be a valid
+     * Handler on which to dispatch the callback; otherwise it should be null.
+     * @param listener Optional OnAnimationStartedListener to find out when the
+     * requested animation has started running.  If for some reason the animation
+     * is not executed, the callback will happen immediately.
+     * @return Returns a new ActivityOptions object that you can use to
+     * supply these options as the options Bundle when starting an activity.
+     * @hide
+     */
+    public static ActivityOptions makeCustomAnimation(Context context,
+            int enterResId, int exitResId, Handler handler, OnAnimationStartedListener listener) {
         ActivityOptions opts = new ActivityOptions();
         opts.mPackageName = context.getPackageName();
         opts.mAnimationType = ANIM_CUSTOM;
         opts.mCustomEnterResId = enterResId;
         opts.mCustomExitResId = exitResId;
+        opts.setListener(handler, listener);
         return opts;
     }
 
+    private void setListener(Handler handler, OnAnimationStartedListener listener) {
+        if (listener != null) {
+            final Handler h = handler;
+            final OnAnimationStartedListener finalListener = listener;
+            mAnimationStartedListener = new IRemoteCallback.Stub() {
+                @Override public void sendResult(Bundle data) throws RemoteException {
+                    h.post(new Runnable() {
+                        @Override public void run() {
+                            finalListener.onAnimationStarted();
+                        }
+                    });
+                }
+            };
+        }
+    }
+
     /**
      * Callback for use with {@link ActivityOptions#makeThumbnailScaleUpAnimation}
      * to find out when the given animation has started running.
@@ -258,19 +299,7 @@ private static ActivityOptions makeThumbnailScaleUpAnimation(View source,
         source.getLocationOnScreen(pts);
         opts.mStartX = pts[0] + startX;
         opts.mStartY = pts[1] + startY;
-        if (listener != null) {
-            final Handler h = source.getHandler();
-            final OnAnimationStartedListener finalListener = listener;
-            opts.mAnimationStartedListener = new IRemoteCallback.Stub() {
-                @Override public void sendResult(Bundle data) throws RemoteException {
-                    h.post(new Runnable() {
-                        @Override public void run() {
-                            finalListener.onAnimationStarted();
-                        }
-                    });
-                }
-            };
-        }
+        opts.setListener(source.getHandler(), listener);
         return opts;
     }
 
@@ -284,6 +313,8 @@ public ActivityOptions(Bundle opts) {
         if (mAnimationType == ANIM_CUSTOM) {
             mCustomEnterResId = opts.getInt(KEY_ANIM_ENTER_RES_ID, 0);
             mCustomExitResId = opts.getInt(KEY_ANIM_EXIT_RES_ID, 0);
+            mAnimationStartedListener = IRemoteCallback.Stub.asInterface(
+                    opts.getIBinder(KEY_ANIM_START_LISTENER));
         } else if (mAnimationType == ANIM_SCALE_UP) {
             mStartX = opts.getInt(KEY_ANIM_START_X, 0);
             mStartY = opts.getInt(KEY_ANIM_START_Y, 0);
@@ -381,14 +412,27 @@ public void update(ActivityOptions otherOptions) {
                 mCustomEnterResId = otherOptions.mCustomEnterResId;
                 mCustomExitResId = otherOptions.mCustomExitResId;
                 mThumbnail = null;
-                mAnimationStartedListener = null;
+                if (otherOptions.mAnimationStartedListener != null) {
+                    try {
+                        otherOptions.mAnimationStartedListener.sendResult(null);
+                    } catch (RemoteException e) {
+                    }
+                }
+                mAnimationStartedListener = otherOptions.mAnimationStartedListener;
                 break;
             case ANIM_SCALE_UP:
                 mAnimationType = otherOptions.mAnimationType;
                 mStartX = otherOptions.mStartX;
                 mStartY = otherOptions.mStartY;
                 mStartWidth = otherOptions.mStartWidth;
                 mStartHeight = otherOptions.mStartHeight;
+                if (otherOptions.mAnimationStartedListener != null) {
+                    try {
+                        otherOptions.mAnimationStartedListener.sendResult(null);
+                    } catch (RemoteException e) {
+                    }
+                }
+                mAnimationStartedListener = null;
                 break;
             case ANIM_THUMBNAIL:
             case ANIM_THUMBNAIL_DELAYED:
@@ -425,6 +469,8 @@ public Bundle toBundle() {
                 b.putInt(KEY_ANIM_TYPE, mAnimationType);
                 b.putInt(KEY_ANIM_ENTER_RES_ID, mCustomEnterResId);
                 b.putInt(KEY_ANIM_EXIT_RES_ID, mCustomExitResId);
+                b.putIBinder(KEY_ANIM_START_LISTENER, mAnimationStartedListener
+                        != null ? mAnimationStartedListener.asBinder() : null);
                 break;
             case ANIM_SCALE_UP:
                 b.putInt(KEY_ANIM_TYPE, mAnimationType);

core/java/android/view/IWindowManager.aidl

@@ -80,7 +80,8 @@ interface IWindowManager
     void setFocusedApp(IBinder token, boolean moveFocusNow);
     void prepareAppTransition(int transit, boolean alwaysKeepCurrent);
     int getPendingAppTransition();
-    void overridePendingAppTransition(String packageName, int enterAnim, int exitAnim);
+    void overridePendingAppTransition(String packageName, int enterAnim, int exitAnim,
+            IRemoteCallback startedCallback);
     void overridePendingAppTransitionScaleUp(int startX, int startY, int startWidth,
             int startHeight);
     void overridePendingAppTransitionThumb(in Bitmap srcThumb, int startX, int startY,

packages/SystemUI/res/anim/search_launch_enter.xml

@@ -22,10 +22,10 @@
 
     <alpha android:fromAlpha="0" android:toAlpha="1.0"
             android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
-            android:interpolator="@android:interpolator/decelerate_quad"
+            android:interpolator="@android:interpolator/decelerate_cubic"
             android:duration="300"/>
 
-    <translate android:fromYDelta="200" android:toYDelta="0"
+    <translate android:fromYDelta="100%" android:toYDelta="0"
             android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
             android:interpolator="@android:interpolator/decelerate_cubic"
             android:duration="300" />

packages/SystemUI/src/com/android/systemui/SearchPanelView.java

@@ -46,8 +46,8 @@
 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 =
@@ -115,18 +115,18 @@ private void startAssistActivity() {
         if (intent == null) return;
         try {
             ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext,
-                    R.anim.search_launch_enter, R.anim.search_launch_exit);
+                    R.anim.search_launch_enter, R.anim.search_launch_exit,
+                    getHandler(), this);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             mContext.startActivity(intent, opts.toBundle());
         } catch (ActivityNotFoundException e) {
             Slog.w(TAG, "Activity not found for " + intent.getAction());
+            onAnimationStarted();
         }
     }
 
-    final MultiWaveView.OnTriggerListener mMultiWaveViewListener
-            = new MultiWaveView.OnTriggerListener() {
-
-        private boolean mWaitingForLaunch;
+    class MultiWaveTriggerListener implements MultiWaveView.OnTriggerListener {
+        boolean mWaitingForLaunch;
 
         public void onGrabbed(View v, int handle) {
         }
@@ -147,19 +147,24 @@ public void onTrigger(View v, final int target) {
                     mWaitingForLaunch = true;
                     startAssistActivity();
                     vibrate();
-                    postDelayed(new Runnable() {
-                        public void run() {
-                            mWaitingForLaunch = false;
-                            mBar.hideSearchPanel();
-                        }
-                    }, SEARCH_PANEL_HOLD_DURATION);
                     break;
             }
         }
 
         public void onFinishFinalAnimation() {
         }
-    };
+    }
+    final MultiWaveTriggerListener mMultiWaveViewListener = new MultiWaveTriggerListener();
+
+    @Override
+    public void onAnimationStarted() {
+        postDelayed(new Runnable() {
+            public void run() {
+                mMultiWaveViewListener.mWaitingForLaunch = false;
+                mBar.hideSearchPanel();
+            }
+        }, SEARCH_PANEL_HOLD_DURATION);
+    }
 
     @Override
     protected void onFinishInflate() {

services/java/com/android/server/am/ActivityManagerService.java

@@ -2804,7 +2804,7 @@ public void overridePendingTransition(IBinder token, String packageName,
             if (self.state == ActivityState.RESUMED
                     || self.state == ActivityState.PAUSING) {
                 mWindowManager.overridePendingAppTransition(packageName,
-                        enterAnim, exitAnim);
+                        enterAnim, exitAnim, null);
             }
 
             Binder.restoreCallingIdentity(origId);

services/java/com/android/server/am/ActivityRecord.java

@@ -558,7 +558,8 @@ void applyOptionsLocked() {
                     service.mWindowManager.overridePendingAppTransition(
                             pendingOptions.getPackageName(),
                             pendingOptions.getCustomEnterResId(),
-                            pendingOptions.getCustomExitResId());
+                            pendingOptions.getCustomExitResId(),
+                            pendingOptions.getOnAnimationStartListener());
                     break;
                 case ActivityOptions.ANIM_SCALE_UP:
                     service.mWindowManager.overridePendingAppTransitionScaleUp(

services/java/com/android/server/am/ActivityStack.java

@@ -1371,6 +1371,10 @@ final void ensureActivitiesVisibleLocked(ActivityRecord starting,
      * nothing happened.
      */
     final boolean resumeTopActivityLocked(ActivityRecord prev) {
+        return resumeTopActivityLocked(prev, null);
+    }
+
+    final boolean resumeTopActivityLocked(ActivityRecord prev, Bundle options) {
         // Find the first activity that is not finishing.
         ActivityRecord next = topRunningActivityLocked(null);
 
@@ -1383,6 +1387,7 @@ final boolean resumeTopActivityLocked(ActivityRecord prev) {
             // There are no more activities!  Let's just start up the
             // Launcher...
             if (mMainStack) {
+                ActivityOptions.abort(options);
                 return mService.startHomeActivityLocked(0);
             }
         }
@@ -1395,6 +1400,7 @@ final boolean resumeTopActivityLocked(ActivityRecord prev) {
             // should be nothing left to do at this point.
             mService.mWindowManager.executeAppTransition();
             mNoAnimActivities.clear();
+            ActivityOptions.abort(options);
             return false;
         }
 
@@ -1409,6 +1415,7 @@ final boolean resumeTopActivityLocked(ActivityRecord prev) {
             // should be nothing left to do at this point.
             mService.mWindowManager.executeAppTransition();
             mNoAnimActivities.clear();
+            ActivityOptions.abort(options);
             return false;
         }
 
@@ -1419,6 +1426,8 @@ final boolean resumeTopActivityLocked(ActivityRecord prev) {
         next.sleeping = false;
         mWaitingVisibleActivities.remove(next);
 
+        next.updateOptionsLocked(options);
+
         if (DEBUG_SWITCH) Slog.v(TAG, "Resuming " + next);
 
         // If we are currently pausing an activity, then don't do anything
@@ -2666,6 +2675,7 @@ final int startActivityUncheckedLocked(ActivityRecord r,
                             movedHome = true;
                             moveHomeToFrontFromLaunchLocked(launchFlags);
                             moveTaskToFrontLocked(taskTop.task, r, options);
+                            options = null;
                         }
                     }
                     // If the caller has requested that the target task be
@@ -2679,9 +2689,10 @@ final int startActivityUncheckedLocked(ActivityRecord r,
                         // is the case, so this is it!  And for paranoia, make
                         // sure we have correctly resumed the top activity.
                         if (doResume) {
-                            resumeTopActivityLocked(null);
+                            resumeTopActivityLocked(null, options);
+                        } else {
+                            ActivityOptions.abort(options);
                         }
-                        ActivityOptions.abort(options);
                         return ActivityManager.START_RETURN_INTENT_TO_CALLER;
                     }
                     if ((launchFlags &
@@ -2767,9 +2778,10 @@ final int startActivityUncheckedLocked(ActivityRecord r,
                         // don't use that intent!)  And for paranoia, make
                         // sure we have correctly resumed the top activity.
                         if (doResume) {
-                            resumeTopActivityLocked(null);
+                            resumeTopActivityLocked(null, options);
+                        } else {
+                            ActivityOptions.abort(options);
                         }
-                        ActivityOptions.abort(options);
                         return ActivityManager.START_TASK_TO_FRONT;
                     }
                 }