Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." into oc-mr1-dev (fbddd89e) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+0 −14

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

		package android.app;

		import static android.os.Build.VERSION_CODES.O_MR1;

		import static java.lang.Character.MIN_VALUE;

		import android.annotation.CallSuper;
		@@ -990,18 +988,6 @@ public class Activity extends ContextThemeWrapper
		@CallSuper
		protected void onCreate(@Nullable Bundle savedInstanceState) {
		if (DEBUG_LIFECYCLE) Slog.v(TAG, "onCreate " + this + ": " + savedInstanceState);

		if (getApplicationInfo().targetSdkVersion >= O_MR1 && mActivityInfo.isFixedOrientation()) {
		final TypedArray ta = obtainStyledAttributes(com.android.internal.R.styleable.Window);
		final boolean isTranslucentOrFloating = ActivityInfo.isTranslucentOrFloating(ta);
		ta.recycle();

		if (isTranslucentOrFloating) {
		throw new IllegalStateException(
		"Only fullscreen opaque activities can request orientation");
		}
		}

		if (mLastNonConfigurationInstances != null) {
		mFragments.restoreLoaderNonConfig(mLastNonConfigurationInstances.loaders);
		}

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

+1 −30

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.annotation.IntDef;
		import android.content.Intent;
		import android.content.res.Configuration;
		import android.content.res.Configuration.NativeConfig;
		import android.content.res.TypedArray;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.Printer;
		@@ -454,7 +453,6 @@ public class ActivityInfo extends ComponentInfo
		*/
		public static final int FLAG_TURN_SCREEN_ON = 0x1000000;


		/**
		* @hide Bit in {@link #flags}: If set, this component will only be seen
		* by the system user. Only works with broadcast receivers. Set from the
		@@ -993,19 +991,11 @@ public class ActivityInfo extends ComponentInfo
		* Returns true if the activity's orientation is fixed.
		* @hide
		*/
		public boolean isFixedOrientation() {
		boolean isFixedOrientation() {
		return isFixedOrientationLandscape() \|\| isFixedOrientationPortrait()
		\|\| screenOrientation == SCREEN_ORIENTATION_LOCKED;
		}

		/**
		* Returns true if the specified orientation is considered fixed.
		* @hide
		*/
		static public boolean isFixedOrientation(int orientation) {
		return isFixedOrientationLandscape(orientation) \|\| isFixedOrientationPortrait(orientation);
		}

		/**
		* Returns true if the activity's orientation is fixed to landscape.
		* @hide
		@@ -1185,25 +1175,6 @@ public class ActivityInfo extends ComponentInfo
		dest.writeFloat(maxAspectRatio);
		}

		/**
		* Determines whether the {@link Activity} is considered translucent or floating.
		* @hide
		*/
		public static boolean isTranslucentOrFloating(TypedArray attributes) {
		final boolean isTranslucent =
		attributes.getBoolean(com.android.internal.R.styleable.Window_windowIsTranslucent,
		false);
		final boolean isSwipeToDismiss = !attributes.hasValue(
		com.android.internal.R.styleable.Window_windowIsTranslucent)
		&& attributes.getBoolean(
		com.android.internal.R.styleable.Window_windowSwipeToDismiss, false);
		final boolean isFloating =
		attributes.getBoolean(com.android.internal.R.styleable.Window_windowIsFloating,
		false);

		return isFloating \|\| isTranslucent \|\| isSwipeToDismiss;
		}

		public static final Parcelable.Creator<ActivityInfo> CREATOR
		= new Parcelable.Creator<ActivityInfo>() {
		public ActivityInfo createFromParcel(Parcel source) {

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ import static android.content.res.Configuration.UI_MODE_TYPE_MASK;
		import static android.content.res.Configuration.UI_MODE_TYPE_VR_HEADSET;
		import static android.os.Build.VERSION_CODES.HONEYCOMB;
		import static android.os.Build.VERSION_CODES.O;
		import static android.os.Build.VERSION_CODES.O_MR1;
		import static android.os.Process.SYSTEM_UID;
		import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
		import static android.view.WindowManagerPolicy.NAV_BAR_LEFT;
		@@ -897,7 +896,15 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo

		Entry ent = AttributeCache.instance().get(packageName,
		realTheme, com.android.internal.R.styleable.Window, userId);
		fullscreen = ent != null && !ActivityInfo.isTranslucentOrFloating(ent.array);
		final boolean translucent = ent != null && (ent.array.getBoolean(
		com.android.internal.R.styleable.Window_windowIsTranslucent, false)
		\|\| (!ent.array.hasValue(
		com.android.internal.R.styleable.Window_windowIsTranslucent)
		&& ent.array.getBoolean(
		com.android.internal.R.styleable.Window_windowSwipeToDismiss,
		false)));
		fullscreen = ent != null && !ent.array.getBoolean(
		com.android.internal.R.styleable.Window_windowIsFloating, false) && !translucent;
		noDisplay = ent != null && ent.array.getBoolean(
		com.android.internal.R.styleable.Window_windowNoDisplay, false);

		@@ -2184,11 +2191,6 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
		}

		void setRequestedOrientation(int requestedOrientation) {
		if (ActivityInfo.isFixedOrientation(requestedOrientation) && !fullscreen
		&& appInfo.targetSdkVersion >= O_MR1) {
		throw new IllegalStateException("Only fullscreen activities can request orientation");
		}

		final int displayId = getDisplayId();
		final Configuration displayConfig =
		mStackSupervisor.getDisplayOverrideConfiguration(displayId);

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
		import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;
		import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;
		import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
		import static android.os.Build.VERSION_CODES.O_MR1;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
		import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
		@@ -74,8 +73,6 @@ import java.io.PrintWriter;
		import java.util.ArrayDeque;
		import java.util.ArrayList;

		import static android.os.Build.VERSION_CODES.O;

		class AppTokenList extends ArrayList<AppWindowToken> {
		}

		@@ -1309,15 +1306,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		*/
		@Override
		int getOrientation(int candidate) {
		// We do not allow non-fullscreen apps to influence orientation starting in O-MR1. While we
		// do throw an exception in {@link Activity#onCreate} and
		// {@link Activity#setRequestedOrientation}, we also ignore the orientation here so that
		// other calculations aren't affected.
		if (!fillsParent() && mTargetSdk >= O_MR1) {
		// Can't specify orientation if app doesn't fill parent.
		return SCREEN_ORIENTATION_UNSET;
		}

		if (candidate == SCREEN_ORIENTATION_BEHIND) {
		// 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

services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ public class AppWindowTokenTests extends WindowTestsBase {
		token.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

		token.setFillsParent(false);
		// Can specify orientation if app doesn't fill parent. Allowed for SDK <= 25.
		// Can specify orientation if doesn't fill parent.
		assertEquals(SCREEN_ORIENTATION_LANDSCAPE, token.getOrientation());

		token.setFillsParent(true);