Merge "Add orientation per-app controls." (0f93d5ff) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ActivityInfo.java

+63 −2

Original line number	Diff line number	Diff line
		@@ -1234,6 +1234,56 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
		@Overridable
		public static final long OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS = 263259275L;

		// Compat framework that per-app overrides rely on only supports booleans. That's why we have
		// multiple OVERRIDE__ORIENTATION_ change ids below instead of just one override with
		// the integer value.

		/**
		* Enables {@link #SCREEN_ORIENTATION_PORTRAIT}. Unless OVERRIDE_ANY_ORIENTATION
		* is enabled, this override is used only when no other fixed orientation was specified by the
		* activity.
		* @hide
		*/
		@ChangeId
		@Disabled
		@Overridable
		public static final long OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT = 265452344L;

		/**
		* Enables {@link #SCREEN_ORIENTATION_NOSENSOR}. Unless OVERRIDE_ANY_ORIENTATION
		* is enabled, this override is used only when no other fixed orientation was specified by the
		* activity.
		* @hide
		*/
		@ChangeId
		@Disabled
		@Overridable
		public static final long OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR = 265451093L;

		/**
		* Enables {@link #SCREEN_ORIENTATION_REVERSE_LANDSCAPE}. Unless OVERRIDE_ANY_ORIENTATION
		* is enabled, this override is used only when activity specify landscape orientation.
		* This can help apps that assume that landscape display orientation corresponds to {@link
		* android.view.Surface#ROTATION_90}, while on some devices it can be {@link
		* android.view.Surface#ROTATION_270}.
		* @hide
		*/
		@ChangeId
		@Disabled
		@Overridable
		public static final long OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE = 266124927L;

		/**
		* When enabled, allows OVERRIDE_LANDSCAPE_ORIENTATION_TO_REVERSE_LANDSCAPE,
		* OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR and OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT
		* to override any orientation requested by the activity.
		* @hide
		*/
		@ChangeId
		@Disabled
		@Overridable
		public static final long OVERRIDE_ANY_ORIENTATION = 265464455L;

		/**
		* Compares activity window layout min width/height with require space for multi window to
		* determine if it can be put into multi window mode.
		@@ -1453,8 +1503,19 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
		* @hide
		*/
		public boolean isFixedOrientation() {
		return isFixedOrientationLandscape() \|\| isFixedOrientationPortrait()
		\|\| screenOrientation == SCREEN_ORIENTATION_LOCKED;
		return isFixedOrientation(screenOrientation);
		}

		/**
		* Returns true if the passed activity's orientation is fixed.
		* @hide
		*/
		public static boolean isFixedOrientation(@ScreenOrientation int orientation) {
		return orientation == SCREEN_ORIENTATION_LOCKED
		// Orientation is fixed to natural display orientation
		\|\| orientation == SCREEN_ORIENTATION_NOSENSOR
		\|\| isFixedOrientationLandscape(orientation)
		\|\| isFixedOrientationPortrait(orientation);
		}

		/**

core/java/android/view/WindowManager.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -1098,6 +1098,32 @@ public interface WindowManager extends ViewManager {
		String PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE =
		"android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE";

		/**
		* Activity level {@link android.content.pm.PackageManager.Property PackageManager
		* .Property} for an app to inform the system that the activity should be excluded from the
		* compatibility override for orientation set by the device manufacturer.
		*
		* <p>With this property set to {@code true} or unset, device manufacturers can override
		* orientation for the activity using their discretion to improve display compatibility.
		*
		* <p>With this property set to {@code false}, device manufactured per-app override for
		* orientation won't be applied.
		*
		* <p><b>Syntax:</b>
		* <pre>
		* <activity>
		* <property
		* android:name="android.window.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE"
		* android:value="true\|false"/>
		* </activity>
		* </pre>
		*
		* @hide
		*/
		// TODO(b/263984287): Make this public API.
		String PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE =
		"android.window.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE";

		/**
		* @hide
		*/

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -762,7 +762,8 @@ class ActivityClientController extends IActivityClientController.Stub {
		synchronized (mGlobalLock) {
		final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);
		return r != null
		? r.getRequestedOrientation() : ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
		? r.getOverrideOrientation()
		: ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
		}
		}

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

+58 −22

Original line number	Diff line number	Diff line
		@@ -1172,8 +1172,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		pw.println(prefix + "mVoiceInteraction=true");
		}
		pw.print(prefix); pw.print("mOccludesParent="); pw.println(mOccludesParent);
		pw.print(prefix); pw.print("mOrientation=");
		pw.println(ActivityInfo.screenOrientationToString(mOrientation));
		pw.print(prefix); pw.print("overrideOrientation=");
		pw.println(ActivityInfo.screenOrientationToString(getOverrideOrientation()));
		pw.print(prefix); pw.print("requestedOrientation=");
		pw.println(ActivityInfo.screenOrientationToString(super.getOverrideOrientation()));
		pw.println(prefix + "mVisibleRequested=" + mVisibleRequested
		+ " mVisible=" + mVisible + " mClientVisible=" + isClientVisible()
		+ ((mDeferHidingClient) ? " mDeferHidingClient=" + mDeferHidingClient : "")
		@@ -1960,6 +1962,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		new ComponentName(info.packageName, info.targetActivity);
		}

		// Don't move below setActivityType since it triggers onConfigurationChange ->
		// resolveOverrideConfiguration that requires having mLetterboxUiController initialised.
		// Don't move below setOrientation(info.screenOrientation) since it triggers
		// getOverrideOrientation that requires having mLetterboxUiController
		// initialised.
		mLetterboxUiController = new LetterboxUiController(mWmService, this);
		mCameraCompatControlEnabled = mWmService.mContext.getResources()
		.getBoolean(R.bool.config_isCameraCompatControlForStretchedIssuesEnabled);

		mTargetSdk = info.applicationInfo.targetSdkVersion;
		mShowForAllUsers = (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0;
		setOrientation(info.screenOrientation);
		@@ -2080,12 +2091,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		launchMode = aInfo.launchMode;

		// Don't move below setActivityType since it triggers onConfigurationChange ->
		// resolveOverrideConfiguration that requires having mLetterboxUiController initialised.
		mLetterboxUiController = new LetterboxUiController(mWmService, this);
		mCameraCompatControlEnabled = mWmService.mContext.getResources()
		.getBoolean(R.bool.config_isCameraCompatControlForStretchedIssuesEnabled);

		setActivityType(_componentSpecified, _launchedFromUid, _intent, options, sourceRecord);

		immersive = (aInfo.flags & FLAG_IMMERSIVE) != 0;
		@@ -2499,7 +2504,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (topAttached != null) {
		if (topAttached.isSnapshotCompatible(snapshot)
		// This trampoline must be the same rotation.
		&& mDisplayContent.getDisplayRotation().rotationForOrientation(mOrientation,
		&& mDisplayContent.getDisplayRotation().rotationForOrientation(
		getOverrideOrientation(),
		mDisplayContent.getRotation()) == snapshot.getRotation()) {
		return STARTING_WINDOW_TYPE_SNAPSHOT;
		}
		@@ -7759,13 +7765,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return mLetterboxUiController.getInheritedOrientation();
		}
		}
		if (mOrientation == SCREEN_ORIENTATION_BEHIND && task != null) {
		if (task != null && getOverrideOrientation() == SCREEN_ORIENTATION_BEHIND) {
		// We use Task here because we want to be consistent with what happens in
		// multi-window mode where other tasks orientations are ignored.
		final ActivityRecord belowCandidate = task.getActivity(
		a -> a.mOrientation != SCREEN_ORIENTATION_UNSET && !a.finishing
		&& a.mOrientation != ActivityInfo.SCREEN_ORIENTATION_BEHIND, this,
		false /* includeBoundary /, true / traverseTopToBottom */);
		a -> a.canDefineOrientationForActivitiesAbove() /* callback */,
		this /* boundary /, false / includeBoundary */,
		true /* traverseTopToBottom */);
		if (belowCandidate != null) {
		return belowCandidate.getRequestedConfigurationOrientation(forDisplay);
		}
		@@ -7773,6 +7779,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return super.getRequestedConfigurationOrientation(forDisplay);
		}

		/**
		* Whether this activity can be used as an orientation source for activities above with
		* {@link SCREEN_ORIENTATION_BEHIND}.
		*/
		boolean canDefineOrientationForActivitiesAbove() {
		if (finishing) {
		return false;
		}
		final int overrideOrientation = getOverrideOrientation();
		return overrideOrientation != SCREEN_ORIENTATION_UNSET
		&& overrideOrientation != SCREEN_ORIENTATION_BEHIND;
		}

		@Override
		void onCancelFixedRotationTransform(int originalDisplayRotation) {
		if (this != mDisplayContent.getLastOrientationSource()) {
		@@ -7799,7 +7818,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		}

		void setRequestedOrientation(int requestedOrientation) {
		void setRequestedOrientation(@ActivityInfo.ScreenOrientation int requestedOrientation) {
		if (mLetterboxUiController.shouldIgnoreRequestedOrientation(requestedOrientation)) {
		return;
		}
		@@ -7842,7 +7861,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		@VisibleForTesting
		boolean shouldIgnoreOrientationRequests() {
		if (!mAppActivityEmbeddingSplitsEnabled
		\|\| !ActivityInfo.isFixedOrientationPortrait(mOrientation)
		\|\| !ActivityInfo.isFixedOrientationPortrait(getOverrideOrientation())
		\|\| task.inMultiWindowMode()) {
		return false;
		}
		@@ -7865,7 +7884,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// Allow app to specify orientation regardless of its visibility state if the current
		// candidate want us to use orientation behind. I.e. the visible app on-top of this one
		// wants us to use the orientation of the app behind it.
		return mOrientation;
		return getOverrideOrientation();
		}

		// The {@link ActivityRecord} should only specify an orientation when it is not closing.
		@@ -7873,15 +7892,31 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// task being started in the wrong orientation during the transition.
		if (!getDisplayContent().mClosingApps.contains(this)
		&& (isVisibleRequested() \|\| getDisplayContent().mOpeningApps.contains(this))) {
		return mOrientation;
		return getOverrideOrientation();
		}

		return SCREEN_ORIENTATION_UNSET;
		}

		/** Returns the app's preferred orientation regardless of its currently visibility state. */
		/**
		* Returns the app's preferred orientation regardless of its current visibility state taking
		* into account orientation per-app overrides applied by the device manufacturers.
		*/
		@Override
		protected int getOverrideOrientation() {
		return mLetterboxUiController.overrideOrientationIfNeeded(super.getOverrideOrientation());
		}

		/**
		* Returns the app's preferred orientation regardless of its currently visibility state. This
		* is used to return a requested value to an app if they call {@link
		* android.app.Activity#getRequestedOrientation} since {@link #getOverrideOrientation} value
		* with override can confuse an app if it's different from what they requested with {@link
		* android.app.Activity#setRequestedOrientation}.
		*/
		@ActivityInfo.ScreenOrientation
		int getRequestedOrientation() {
		return mOrientation;
		return super.getOverrideOrientation();
		}

		/**
		@@ -8444,8 +8479,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// If orientation is respected when insets are applied, then stableBounds will be empty.
		boolean orientationRespectedWithInsets =
		orientationRespectedWithInsets(parentBounds, stableBounds);
		if (orientationRespectedWithInsets
		&& handlesOrientationChangeFromDescendant(mOrientation)) {
		if (orientationRespectedWithInsets && handlesOrientationChangeFromDescendant(
		getOverrideOrientation())) {
		// No need to letterbox because of fixed orientation. Display will handle
		// fixed-orientation requests and a display rotation is enough to respect requested
		// orientation with insets applied.
		@@ -9083,7 +9118,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}

		if (info.isChangeEnabled(OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY)
		&& !ActivityInfo.isFixedOrientationPortrait(getRequestedOrientation())) {
		&& !ActivityInfo.isFixedOrientationPortrait(
		getOverrideOrientation())) {
		return info.getMinAspectRatio();
		}

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
		DisplayArea(WindowManagerService wms, Type type, String name, int featureId) {
		super(wms);
		// TODO(display-area): move this up to ConfigurationContainer
		mOrientation = SCREEN_ORIENTATION_UNSET;
		setOverrideOrientation(SCREEN_ORIENTATION_UNSET);
		mType = type;
		mName = name;
		mFeatureId = featureId;
		@@ -166,7 +166,8 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
		// If this is set to ignore the orientation request, we don't propagate descendant
		// orientation request.
		final int orientation = requestingContainer != null
		? requestingContainer.mOrientation : SCREEN_ORIENTATION_UNSET;
		? requestingContainer.getOverrideOrientation()
		: SCREEN_ORIENTATION_UNSET;
		return !getIgnoreOrientationRequest(orientation)
		&& super.onDescendantOrientationChanged(requestingContainer);
		}