Move app transition constants (4b71aa1f) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManagerPolicy.java

+8 −50

Original line number	Diff line number	Diff line
		@@ -401,60 +401,18 @@ public interface WindowManagerPolicy {
		public void rebootSafeMode(boolean confirm);
		}

		/**
		* Bit mask that is set for all enter transition.
		*/
		public final int TRANSIT_ENTER_MASK = 0x1000;

		/**
		* Bit mask that is set for all exit transitions.
		*/
		public final int TRANSIT_EXIT_MASK = 0x2000;

		/** Not set up for a transition. */
		public final int TRANSIT_UNSET = -1;
		/** No animation for transition. */
		public final int TRANSIT_NONE = 0;
		/** Window has been added to the screen. */
		public final int TRANSIT_ENTER = 1 \| TRANSIT_ENTER_MASK;
		public static final int TRANSIT_ENTER = 1;
		/** Window has been removed from the screen. */
		public final int TRANSIT_EXIT = 2 \| TRANSIT_EXIT_MASK;
		public static final int TRANSIT_EXIT = 2;
		/** Window has been made visible. */
		public final int TRANSIT_SHOW = 3 \| TRANSIT_ENTER_MASK;
		/** Window has been made invisible. */
		public final int TRANSIT_HIDE = 4 \| TRANSIT_EXIT_MASK;
		public static final int TRANSIT_SHOW = 3;
		/** Window has been made invisible.
		* TODO: Consider removal as this is unused. */
		public static final int TRANSIT_HIDE = 4;
		/** The "application starting" preview window is no longer needed, and will
		* animate away to show the real window. */
		public final int TRANSIT_PREVIEW_DONE = 5;
		/** A window in a new activity is being opened on top of an existing one
		* in the same task. */
		public final int TRANSIT_ACTIVITY_OPEN = 6 \| TRANSIT_ENTER_MASK;
		/** The window in the top-most activity is being closed to reveal the
		* previous activity in the same task. */
		public final int TRANSIT_ACTIVITY_CLOSE = 7 \| TRANSIT_EXIT_MASK;
		/** A window in a new task is being opened on top of an existing one
		* in another activity's task. */
		public final int TRANSIT_TASK_OPEN = 8 \| TRANSIT_ENTER_MASK;
		/** A window in the top-most activity is being closed to reveal the
		* previous activity in a different task. */
		public final int TRANSIT_TASK_CLOSE = 9 \| TRANSIT_EXIT_MASK;
		/** A window in an existing task is being displayed on top of an existing one
		* in another activity's task. */
		public final int TRANSIT_TASK_TO_FRONT = 10 \| TRANSIT_ENTER_MASK;
		/** A window in an existing task is being put below all other tasks. */
		public final int TRANSIT_TASK_TO_BACK = 11 \| TRANSIT_EXIT_MASK;
		/** A window in a new activity that doesn't have a wallpaper is being
		* opened on top of one that does, effectively closing the wallpaper. */
		public final int TRANSIT_WALLPAPER_CLOSE = 12 \| TRANSIT_EXIT_MASK;
		/** A window in a new activity that does have a wallpaper is being
		* opened on one that didn't, effectively opening the wallpaper. */
		public final int TRANSIT_WALLPAPER_OPEN = 13 \| TRANSIT_ENTER_MASK;
		/** A window in a new activity is being opened on top of an existing one,
		* and both are on top of the wallpaper. */
		public final int TRANSIT_WALLPAPER_INTRA_OPEN = 14 \| TRANSIT_ENTER_MASK;
		/** The window in the top-most activity is being closed to reveal the
		* previous activity, and both are on top of he wallpaper. */
		public final int TRANSIT_WALLPAPER_INTRA_CLOSE = 15 \| TRANSIT_EXIT_MASK;
		public static final int TRANSIT_PREVIEW_DONE = 5;

		// NOTE: screen off reasons are in order of significance, with more
		// important ones lower than less important ones.

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+16 −72

Original line number	Diff line number	Diff line
		@@ -1711,31 +1711,40 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		static final boolean PRINT_ANIM = false;

		/** {@inheritDoc} */
		@Override
		public int selectAnimationLw(WindowState win, int transit) {
		if (PRINT_ANIM) Log.i(TAG, "selectAnimation in " + win
		+ ": transit=" + transit);
		if (win == mStatusBar) {
		if (transit == TRANSIT_EXIT \|\| transit == TRANSIT_HIDE) {
		if (transit == TRANSIT_EXIT
		\|\| transit == TRANSIT_HIDE) {
		return R.anim.dock_top_exit;
		} else if (transit == TRANSIT_ENTER \|\| transit == TRANSIT_SHOW) {
		} else if (transit == TRANSIT_ENTER
		\|\| transit == TRANSIT_SHOW) {
		return R.anim.dock_top_enter;
		}
		} else if (win == mNavigationBar) {
		// This can be on either the bottom or the right.
		if (mNavigationBarOnBottom) {
		if (transit == TRANSIT_EXIT \|\| transit == TRANSIT_HIDE) {
		if (transit == TRANSIT_EXIT
		\|\| transit == TRANSIT_HIDE) {
		return R.anim.dock_bottom_exit;
		} else if (transit == TRANSIT_ENTER \|\| transit == TRANSIT_SHOW) {
		} else if (transit == TRANSIT_ENTER
		\|\| transit == TRANSIT_SHOW) {
		return R.anim.dock_bottom_enter;
		}
		} else {
		if (transit == TRANSIT_EXIT \|\| transit == TRANSIT_HIDE) {
		if (transit == TRANSIT_EXIT
		\|\| transit == TRANSIT_HIDE) {
		return R.anim.dock_right_exit;
		} else if (transit == TRANSIT_ENTER \|\| transit == TRANSIT_SHOW) {
		} else if (transit == TRANSIT_ENTER
		\|\| transit == TRANSIT_SHOW) {
		return R.anim.dock_right_enter;
		}
		}
		} if (transit == TRANSIT_PREVIEW_DONE) {
		}

		if (transit == TRANSIT_PREVIEW_DONE) {
		if (win.hasAppShownWindows()) {
		if (PRINT_ANIM) Log.i(TAG, "**** STARTING EXIT");
		return com.android.internal.R.anim.app_starting_exit;
		@@ -4568,71 +4577,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return true;
		}

		/**
		* Returns the human readable name of a window transition.
		*
		* @param transition The window transition.
		* @return The transition symbolic name.
		*/
		public static String windowTransitionToString(int transition) {
		switch (transition) {
		case WindowManagerPolicy.TRANSIT_UNSET: {
		return "TRANSIT_UNSET";
		}
		case WindowManagerPolicy.TRANSIT_NONE: {
		return "TRANSIT_NONE";
		}
		case WindowManagerPolicy.TRANSIT_ENTER: {
		return "TRANSIT_ENTER";
		}
		case WindowManagerPolicy.TRANSIT_EXIT: {
		return "TRANSIT_EXIT";
		}
		case WindowManagerPolicy.TRANSIT_SHOW: {
		return "TRANSIT_SHOW";
		}
		case WindowManagerPolicy.TRANSIT_EXIT_MASK: {
		return "TRANSIT_EXIT_MASK";
		}
		case WindowManagerPolicy.TRANSIT_PREVIEW_DONE: {
		return "TRANSIT_PREVIEW_DONE";
		}
		case WindowManagerPolicy.TRANSIT_ACTIVITY_OPEN: {
		return "TRANSIT_ACTIVITY_OPEN";
		}
		case WindowManagerPolicy.TRANSIT_ACTIVITY_CLOSE: {
		return "TRANSIT_ACTIVITY_CLOSE";
		}
		case WindowManagerPolicy.TRANSIT_TASK_OPEN: {
		return "TRANSIT_TASK_OPEN";
		}
		case WindowManagerPolicy.TRANSIT_TASK_CLOSE: {
		return "TRANSIT_TASK_CLOSE";
		}
		case WindowManagerPolicy.TRANSIT_TASK_TO_FRONT: {
		return "TRANSIT_TASK_TO_FRONT";
		}
		case WindowManagerPolicy.TRANSIT_TASK_TO_BACK: {
		return "TRANSIT_TASK_TO_BACK";
		}
		case WindowManagerPolicy.TRANSIT_WALLPAPER_CLOSE: {
		return "TRANSIT_WALLPAPER_CLOSE";
		}
		case WindowManagerPolicy.TRANSIT_WALLPAPER_OPEN: {
		return "TRANSIT_WALLPAPER_OPEN";
		}
		case WindowManagerPolicy.TRANSIT_WALLPAPER_INTRA_OPEN: {
		return "TRANSIT_WALLPAPER_INTRA_OPEN";
		}
		case WindowManagerPolicy.TRANSIT_WALLPAPER_INTRA_CLOSE: {
		return "TRANSIT_WALLPAPER_INTRA_CLOSE";
		}
		default: {
		return "<UNKNOWN>";
		}
		}
		}

		@Override
		public void dump(String prefix, PrintWriter pw, String[] args) {
		pw.print(prefix); pw.print("mSafeMode="); pw.print(mSafeMode);

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import com.android.server.SystemServer;
		import com.android.server.Watchdog;
		import com.android.server.am.ActivityStack.ActivityState;
		import com.android.server.pm.UserManagerService;
		import com.android.server.wm.AppTransition;
		import com.android.server.wm.WindowManagerService;

		import dalvik.system.Zygote;
		@@ -130,7 +131,6 @@ import android.view.Gravity;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.WindowManager;
		import android.view.WindowManagerPolicy;

		import java.io.BufferedInputStream;
		import java.io.BufferedOutputStream;
		@@ -1970,9 +1970,9 @@ public final class ActivityManagerService extends ActivityManagerNative

		boolean isNextTransitionForward() {
		int transit = mWindowManager.getPendingAppTransition();
		return transit == WindowManagerPolicy.TRANSIT_ACTIVITY_OPEN
		\|\| transit == WindowManagerPolicy.TRANSIT_TASK_OPEN
		\|\| transit == WindowManagerPolicy.TRANSIT_TASK_TO_FRONT;
		return transit == AppTransition.TRANSIT_ACTIVITY_OPEN
		\|\| transit == AppTransition.TRANSIT_TASK_OPEN
		\|\| transit == AppTransition.TRANSIT_TASK_TO_FRONT;
		}

		final ProcessRecord startProcessLocked(String processName,

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

+21 −21

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import com.android.internal.app.HeavyWeightSwitcherActivity;
		import com.android.internal.os.BatteryStatsImpl;
		import com.android.server.am.ActivityManagerService.PendingActivityLaunch;
		import com.android.server.wm.AppTransition;

		import android.app.Activity;
		import android.app.ActivityManager;
		@@ -61,7 +62,6 @@ import android.util.EventLog;
		import android.util.Log;
		import android.util.Slog;
		import android.view.Display;
		import android.view.WindowManagerPolicy;

		import java.io.IOException;
		import java.lang.ref.WeakReference;
		@@ -423,7 +423,7 @@ final class ActivityStack {
		}
		}
		}
		};
		}

		ActivityStack(ActivityManagerService service, Context context, boolean mainStack, Looper looper) {
		mHandler = new ActivityStackHandler(looper);
		@@ -1612,11 +1612,11 @@ final class ActivityStack {
		"Prepare close transition: prev=" + prev);
		if (mNoAnimActivities.contains(prev)) {
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_NONE, false);
		AppTransition.TRANSIT_NONE, false);
		} else {
		mService.mWindowManager.prepareAppTransition(prev.task == next.task
		? WindowManagerPolicy.TRANSIT_ACTIVITY_CLOSE
		: WindowManagerPolicy.TRANSIT_TASK_CLOSE, false);
		? AppTransition.TRANSIT_ACTIVITY_CLOSE
		: AppTransition.TRANSIT_TASK_CLOSE, false);
		}
		mService.mWindowManager.setAppWillBeHidden(prev.appToken);
		mService.mWindowManager.setAppVisibility(prev.appToken, false);
		@@ -1626,11 +1626,11 @@ final class ActivityStack {
		if (mNoAnimActivities.contains(next)) {
		noAnim = true;
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_NONE, false);
		AppTransition.TRANSIT_NONE, false);
		} else {
		mService.mWindowManager.prepareAppTransition(prev.task == next.task
		? WindowManagerPolicy.TRANSIT_ACTIVITY_OPEN
		: WindowManagerPolicy.TRANSIT_TASK_OPEN, false);
		? AppTransition.TRANSIT_ACTIVITY_OPEN
		: AppTransition.TRANSIT_TASK_OPEN, false);
		}
		}
		if (false) {
		@@ -1643,10 +1643,10 @@ final class ActivityStack {
		if (mNoAnimActivities.contains(next)) {
		noAnim = true;
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_NONE, false);
		AppTransition.TRANSIT_NONE, false);
		} else {
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_ACTIVITY_OPEN, false);
		AppTransition.TRANSIT_ACTIVITY_OPEN, false);
		}
		}
		if (!noAnim) {
		@@ -1890,12 +1890,12 @@ final class ActivityStack {
		"Prepare open transition: starting " + r);
		if ((r.intent.getFlags()&Intent.FLAG_ACTIVITY_NO_ANIMATION) != 0) {
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_NONE, keepCurTransition);
		AppTransition.TRANSIT_NONE, keepCurTransition);
		mNoAnimActivities.add(r);
		} else {
		mService.mWindowManager.prepareAppTransition(newTask
		? WindowManagerPolicy.TRANSIT_TASK_OPEN
		: WindowManagerPolicy.TRANSIT_ACTIVITY_OPEN, keepCurTransition);
		? AppTransition.TRANSIT_TASK_OPEN
		: AppTransition.TRANSIT_ACTIVITY_OPEN, keepCurTransition);
		mNoAnimActivities.remove(r);
		}
		r.updateOptionsLocked(options);
		@@ -3812,8 +3812,8 @@ final class ActivityStack {
		if (DEBUG_TRANSITION) Slog.v(TAG,
		"Prepare close transition: finishing " + r);
		mService.mWindowManager.prepareAppTransition(endTask
		? WindowManagerPolicy.TRANSIT_TASK_CLOSE
		: WindowManagerPolicy.TRANSIT_ACTIVITY_CLOSE, false);
		? AppTransition.TRANSIT_TASK_CLOSE
		: AppTransition.TRANSIT_ACTIVITY_CLOSE, false);

		// Tell window manager to prepare for this one to be removed.
		mService.mWindowManager.setAppVisibility(r.appToken, false);
		@@ -4300,7 +4300,7 @@ final class ActivityStack {
		(reason.intent.getFlags()&Intent.FLAG_ACTIVITY_NO_ANIMATION) != 0) {
		ActivityOptions.abort(options);
		} else {
		updateTransitLocked(WindowManagerPolicy.TRANSIT_TASK_TO_FRONT, options);
		updateTransitLocked(AppTransition.TRANSIT_TASK_TO_FRONT, options);
		}
		return;
		}
		@@ -4338,14 +4338,14 @@ final class ActivityStack {
		if (reason != null &&
		(reason.intent.getFlags()&Intent.FLAG_ACTIVITY_NO_ANIMATION) != 0) {
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_NONE, false);
		AppTransition.TRANSIT_NONE, false);
		ActivityRecord r = topRunningActivityLocked(null);
		if (r != null) {
		mNoAnimActivities.add(r);
		}
		ActivityOptions.abort(options);
		} else {
		updateTransitLocked(WindowManagerPolicy.TRANSIT_TASK_TO_FRONT, options);
		updateTransitLocked(AppTransition.TRANSIT_TASK_TO_FRONT, options);
		}

		mService.mWindowManager.moveAppTokensToTop(moved);
		@@ -4431,14 +4431,14 @@ final class ActivityStack {
		if (reason != null &&
		(reason.intent.getFlags()&Intent.FLAG_ACTIVITY_NO_ANIMATION) != 0) {
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_NONE, false);
		AppTransition.TRANSIT_NONE, false);
		ActivityRecord r = topRunningActivityLocked(null);
		if (r != null) {
		mNoAnimActivities.add(r);
		}
		} else {
		mService.mWindowManager.prepareAppTransition(
		WindowManagerPolicy.TRANSIT_TASK_TO_BACK, false);
		AppTransition.TRANSIT_TASK_TO_BACK, false);
		}
		mService.mWindowManager.moveAppTokensToBottom(moved);
		if (VALIDATE_TOKENS) {

services/java/com/android/server/wm/AppTransition.java

+115 −22

File changed.

Preview size limit exceeded, changes collapsed.