Merge "Allow stacks in split screen to show on lock screen." (7acd0deb) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -556,10 +556,10 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> {
		return stack == getTopStack();
		}

		boolean isTopFullscreenStack(ActivityStack stack) {
		boolean isTopNotPinnedStack(ActivityStack stack) {
		for (int i = mStacks.size() - 1; i >= 0; --i) {
		final ActivityStack current = mStacks.get(i);
		if (current.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {
		if (!current.inPinnedWindowingMode()) {
		return current == stack;
		}
		}

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -2730,12 +2730,14 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
		}

		/**
		* @return true if the activity contains windows that have
		* {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED} set or if the activity has set
		* {@link #mShowWhenLocked}.
		* @return true if the activity windowing mode is not
		* {@link android.app.WindowConfiguration#WINDOWING_MODE_PINNED} and activity contains
		* windows that have {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED} set or if the activity
		* has set {@link #mShowWhenLocked}.
		* Multi-windowing mode will be exited if true is returned.
		*/
		boolean canShowWhenLocked() {
		return !inMultiWindowMode() && (mShowWhenLocked
		return !inPinnedWindowingMode() && (mShowWhenLocked
		\|\| service.mWindowManager.containsShowWhenLockedWindow(appToken));
		}

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server.am;

		import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SECONDARY_DISPLAY;
		import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		@@ -144,7 +143,6 @@ import com.android.internal.app.IVoiceInteractor;
		import com.android.internal.os.BatteryStatsImpl;
		import com.android.server.Watchdog;
		import com.android.server.am.ActivityManagerService.ItemMatcher;
		import com.android.server.am.EventLogTags;
		import com.android.server.wm.ConfigurationContainer;
		import com.android.server.wm.StackWindowController;
		import com.android.server.wm.StackWindowListener;
		@@ -1819,7 +1817,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		boolean behindFullscreenActivity = !stackShouldBeVisible;
		boolean resumeNextActivity = mStackSupervisor.isFocusedStack(this)
		&& (isInStackLocked(starting) == null);
		final boolean isTopFullscreenStack = getDisplay().isTopFullscreenStack(this);
		final boolean isTopNotPinnedStack = getDisplay().isTopNotPinnedStack(this);
		for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
		final TaskRecord task = mTaskHistory.get(taskNdx);
		final ArrayList<ActivityRecord> activities = task.mActivities;
		@@ -1841,7 +1839,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai

		// Now check whether it's really visible depending on Keyguard state.
		final boolean reallyVisible = checkKeyguardVisibility(r,
		visibleIgnoringKeyguard, isTop && isTopFullscreenStack);
		visibleIgnoringKeyguard, isTop && isTopNotPinnedStack);
		if (visibleIgnoringKeyguard) {
		behindFullscreenActivity = updateBehindFullscreen(!stackShouldBeVisible,
		behindFullscreenActivity, r);