Merge "Multiple performance changes to speed recents invocation/app launching... (5c1b42e4) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -795,6 +795,12 @@ public class ActivityManager {
		*/
		public static final int RECENT_INCLUDE_PROFILES = 0x0004;

		/**
		* Ignores all tasks that are on the home stack.
		* @hide
		*/
		public static final int RECENT_IGNORE_HOME_STACK_TASKS = 0x0008;

		/**
		* <p></p>Return a list of the tasks that the user has recently launched, with
		* the most recent being first and older ones after in order.

core/java/android/app/ActivityOptions.java

+72 −1

Original line number	Diff line number	Diff line
		@@ -128,6 +128,10 @@ public class ActivityOptions {
		public static final int ANIM_DEFAULT = 6;
		/** @hide */
		public static final int ANIM_LAUNCH_TASK_BEHIND = 7;
		/** @hide */
		public static final int ANIM_THUMBNAIL_ASPECT_SCALE_UP = 8;
		/** @hide */
		public static final int ANIM_THUMBNAIL_ASPECT_SCALE_DOWN = 9;

		private String mPackageName;
		private int mAnimationType = ANIM_NONE;
		@@ -337,6 +341,67 @@ public class ActivityOptions {
		return opts;
		}

		/**
		* Create an ActivityOptions specifying an animation where the new activity
		* window and a thumbnail is aspect-scaled to a new location.
		*
		* @param source The View that this thumbnail is animating from. This
		* defines the coordinate space for <var>startX</var> and <var>startY</var>.
		* @param thumbnail The bitmap that will be shown as the initial thumbnail
		* of the animation.
		* @param startX The x starting location of the bitmap, relative to <var>source</var>.
		* @param startY The y starting location of the bitmap, relative to <var>source</var>.
		* @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 makeThumbnailAspectScaleUpAnimation(View source,
		Bitmap thumbnail, int startX, int startY, OnAnimationStartedListener listener) {
		return makeAspectScaledThumbnailAnimation(source, thumbnail, startX, startY, listener,
		true);
		}

		/**
		* Create an ActivityOptions specifying an animation where the new activity
		* window and a thumbnail is aspect-scaled to a new location.
		*
		* @param source The View that this thumbnail is animating to. This
		* defines the coordinate space for <var>startX</var> and <var>startY</var>.
		* @param thumbnail The bitmap that will be shown as the final thumbnail
		* of the animation.
		* @param startX The x end location of the bitmap, relative to <var>source</var>.
		* @param startY The y end location of the bitmap, relative to <var>source</var>.
		* @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 makeThumbnailAspectScaleDownAnimation(View source,
		Bitmap thumbnail, int startX, int startY, OnAnimationStartedListener listener) {
		return makeAspectScaledThumbnailAnimation(source, thumbnail, startX, startY, listener,
		false);
		}

		private static ActivityOptions makeAspectScaledThumbnailAnimation(View source, Bitmap thumbnail,
		int startX, int startY, OnAnimationStartedListener listener, boolean scaleUp) {
		ActivityOptions opts = new ActivityOptions();
		opts.mPackageName = source.getContext().getPackageName();
		opts.mAnimationType = scaleUp ? ANIM_THUMBNAIL_ASPECT_SCALE_UP :
		ANIM_THUMBNAIL_ASPECT_SCALE_DOWN;
		opts.mThumbnail = thumbnail;
		int[] pts = new int[2];
		source.getLocationOnScreen(pts);
		opts.mStartX = pts[0] + startX;
		opts.mStartY = pts[1] + startY;
		opts.setOnAnimationStartedListener(source.getHandler(), listener);
		return opts;
		}

		/**
		* Create an ActivityOptions to transition between Activities using cross-Activity scene
		* animations. This method carries the position of one shared element to the started Activity.
		@@ -484,6 +549,8 @@ public class ActivityOptions {

		case ANIM_THUMBNAIL_SCALE_UP:
		case ANIM_THUMBNAIL_SCALE_DOWN:
		case ANIM_THUMBNAIL_ASPECT_SCALE_UP:
		case ANIM_THUMBNAIL_ASPECT_SCALE_DOWN:
		mThumbnail = (Bitmap) opts.getParcelable(KEY_ANIM_THUMBNAIL);
		mStartX = opts.getInt(KEY_ANIM_START_X, 0);
		mStartY = opts.getInt(KEY_ANIM_START_Y, 0);
		@@ -635,6 +702,8 @@ public class ActivityOptions {
		break;
		case ANIM_THUMBNAIL_SCALE_UP:
		case ANIM_THUMBNAIL_SCALE_DOWN:
		case ANIM_THUMBNAIL_ASPECT_SCALE_UP:
		case ANIM_THUMBNAIL_ASPECT_SCALE_DOWN:
		mThumbnail = otherOptions.mThumbnail;
		mStartX = otherOptions.mStartX;
		mStartY = otherOptions.mStartY;
		@@ -691,6 +760,8 @@ public class ActivityOptions {
		break;
		case ANIM_THUMBNAIL_SCALE_UP:
		case ANIM_THUMBNAIL_SCALE_DOWN:
		case ANIM_THUMBNAIL_ASPECT_SCALE_UP:
		case ANIM_THUMBNAIL_ASPECT_SCALE_DOWN:
		b.putParcelable(KEY_ANIM_THUMBNAIL, mThumbnail);
		b.putInt(KEY_ANIM_START_X, mStartX);
		b.putInt(KEY_ANIM_START_Y, mStartY);

core/java/android/view/IWindowManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,8 @@ interface IWindowManager
		int startHeight);
		void overridePendingAppTransitionThumb(in Bitmap srcThumb, int startX, int startY,
		IRemoteCallback startedCallback, boolean scaleUp);
		void overridePendingAppTransitionAspectScaledThumb(in Bitmap srcThumb, int startX,
		int startY, IRemoteCallback startedCallback, boolean scaleUp);
		void executeAppTransition();
		void setAppStartingWindow(IBinder token, String pkg, int theme,
		in CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,

core/res/res/values-sw600dp/dimens.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@
		-->
		<resources>
		<!-- The width that is used when creating thumbnails of applications. -->
		<dimen name="thumbnail_width">512dp</dimen>
		<dimen name="thumbnail_width">360dp</dimen>
		<!-- The height that is used when creating thumbnails of applications. -->
		<dimen name="thumbnail_height">512dp</dimen>
		<dimen name="thumbnail_height">360dp</dimen>
		<!-- The maximum number of action buttons that should be permitted within
		an action bar/action mode. This will be used to determine how many
		showAsAction="ifRoom" items can fit. "always" items can override this. -->

packages/SystemUI/res/anim/recents_from_launcher_enter.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,9 +20,9 @@
		<set xmlns:android="http://schemas.android.com/apk/res/android"
		android:shareInterpolator="false"
		android:zAdjustment="normal">
		<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
		<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
		android:fillEnabled="true"
		android:fillBefore="true" android:fillAfter="true"
		android:interpolator="@android:interpolator/linear"
		android:duration="200"/>
		android:duration="100"/>
		</set>