Merge "Remove starting window whenever the acitvity is stopped" into nyc-dev (a06c2553) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ final class ActivityRecord {
		pw.print(" visible="); pw.print(visible);
		pw.print(" sleeping="); pw.print(sleeping);
		pw.print(" idle="); pw.println(idle);
		pw.print(" mStartingWindowShown="); pw.println(mStartingWindowShown);
		pw.print(prefix); pw.print("fullscreen="); pw.print(fullscreen);
		pw.print(" noDisplay="); pw.print(noDisplay);
		pw.print(" immersive="); pw.print(immersive);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2263,6 +2263,7 @@ final class ActivityStack {
		mService.compatibilityInfoForPackageLocked(next.info.applicationInfo),
		next.nonLocalizedLabel, next.labelRes, next.icon, next.logo,
		next.windowFlags, null, true);
		next.mStartingWindowShown = true;
		}
		mStackSupervisor.startSpecificActivityLocked(next, true, false);
		if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
		@@ -2295,6 +2296,7 @@ final class ActivityStack {
		next.nonLocalizedLabel,
		next.labelRes, next.icon, next.logo, next.windowFlags,
		null, true);
		next.mStartingWindowShown = true;
		}
		if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Restarting: " + next);
		}

services/core/java/com/android/server/wm/AppWindowToken.java

+27 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		@@ -159,6 +160,25 @@ class AppWindowToken extends WindowToken {
		}
		}

		void onFirstWindowDrawn(WindowState win, WindowStateAnimator winAnimator) {
		firstWindowDrawn = true;

		// We now have a good window to show, remove dead placeholders
		removeAllDeadWindows();

		if (startingData != null) {
		if (DEBUG_STARTING_WINDOW \|\| DEBUG_ANIM) Slog.v(TAG, "Finish starting "
		+ win.mToken + ": first real window is shown, no animation");
		// If this initial window is animating, stop it -- we will do an animation to reveal
		// it from behind the starting window, so there is no need for it to also be doing its
		// own stuff.
		winAnimator.clearAnimation();
		winAnimator.mService.mFinishedStarting.add(this);
		winAnimator.mService.mH.sendEmptyMessage(H.FINISHED_STARTING);
		}
		updateReportedVisibilityLocked();
		}

		void updateReportedVisibilityLocked() {
		if (appToken == null) {
		return;
		@@ -357,6 +377,9 @@ class AppWindowToken extends WindowToken {
		void notifyAppStopped() {
		mAppStopped = true;
		destroySurfaces();

		// Remove any starting window that was added for this app if they are still around.
		mTask.mService.scheduleRemoveStartingWindowLocked(this);
		}

		/**
		@@ -594,6 +617,9 @@ class AppWindowToken extends WindowToken {
		if (paused) {
		pw.print(prefix); pw.print("paused="); pw.println(paused);
		}
		if (mAppStopped) {
		pw.print(prefix); pw.print("mAppStopped="); pw.println(mAppStopped);
		}
		if (numInterestingWindows != 0 \|\| numDrawnWindows != 0
		\|\| allDrawn \|\| mAppAnimator.allDrawn) {
		pw.print(prefix); pw.print("numInterestingWindows=");
		@@ -619,7 +645,7 @@ class AppWindowToken extends WindowToken {
		pw.print(prefix); pw.print("startingWindow="); pw.print(startingWindow);
		pw.print(" startingView="); pw.print(startingView);
		pw.print(" startingDisplayed="); pw.print(startingDisplayed);
		pw.print(" startingMoved"); pw.println(startingMoved);
		pw.print(" startingMoved="); pw.println(startingMoved);
		}
		if (!mFrozenBounds.isEmpty()) {
		pw.print(prefix); pw.print("mFrozenBounds="); pw.print(mFrozenBounds);

services/core/java/com/android/server/wm/WindowState.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -2347,7 +2347,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		pw.print(prefix); pw.print("mHasSurface="); pw.print(mHasSurface);
		pw.print(" mShownPosition="); mShownPosition.printShortString(pw);
		pw.print(" isReadyForDisplay()="); pw.print(isReadyForDisplay());
		pw.print(" hasSavedSurface()="); pw.println(hasSavedSurface());
		pw.print(" hasSavedSurface()="); pw.print(hasSavedSurface());
		pw.print(" mWindowRemovalAllowed="); pw.println(mWindowRemovalAllowed);
		if (dumpAll) {
		pw.print(prefix); pw.print("mFrame="); mFrame.printShortString(pw);
		pw.print(" last="); mLastFrame.printShortString(pw);

services/core/java/com/android/server/wm/WindowStateAnimator.java

+1 −17

Original line number	Diff line number	Diff line
		@@ -1522,23 +1522,7 @@ class WindowStateAnimator {
		}

		if (mWin.mAttrs.type != TYPE_APPLICATION_STARTING && mWin.mAppToken != null) {
		mWin.mAppToken.firstWindowDrawn = true;

		// We now have a good window to show, remove dead placeholders
		mWin.mAppToken.removeAllDeadWindows();

		if (mWin.mAppToken.startingData != null) {
		if (DEBUG_STARTING_WINDOW \|\| DEBUG_ANIM) Slog.v(TAG, "Finish starting "
		+ mWin.mToken + ": first real window is shown, no animation");
		// If this initial window is animating, stop it -- we
		// will do an animation to reveal it from behind the
		// starting window, so there is no need for it to also
		// be doing its own stuff.
		clearAnimation();
		mService.mFinishedStarting.add(mWin.mAppToken);
		mService.mH.sendEmptyMessage(H.FINISHED_STARTING);
		}
		mWin.mAppToken.updateReportedVisibilityLocked();
		mWin.mAppToken.onFirstWindowDrawn(mWin, this);
		}

		return true;