Merge "Add sys-apis for dev-mode freeform support" (29206621) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ import android.provider.Settings;
		import android.util.Log;
		import android.view.IRecentsAnimationController;
		import android.view.IRecentsAnimationRunner;

		import android.view.RemoteAnimationTarget;

		import com.android.internal.app.IVoiceInteractionManagerService;
		@@ -480,4 +479,16 @@ public class ActivityManagerWrapper {
		return false;
		}
		}

		/**
		* Returns true if the system supports freeform multi-window.
		*/
		public boolean supportsFreeformMultiWindow(Context context) {
		final boolean freeformDevOption = Settings.Global.getInt(context.getContentResolver(),
		Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, 0) != 0;
		return ActivityTaskManager.supportsMultiWindow(context)
		&& (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT)
		\|\| freeformDevOption);
		}
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.shared.system;

		import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT;
		import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

		import android.app.ActivityOptions;
		@@ -41,6 +42,15 @@ public abstract class ActivityOptionsCompat {
		return options;
		}

		/**
		* @return ActivityOptions for starting a task in freeform.
		*/
		public static ActivityOptions makeFreeformOptions() {
		final ActivityOptions options = ActivityOptions.makeBasic();
		options.setLaunchWindowingMode(WINDOWING_MODE_FREEFORM);
		return options;
		}

		public static ActivityOptions makeRemoteAnimation(
		RemoteAnimationAdapterCompat remoteAnimationAdapter) {
		return ActivityOptions.makeRemoteAnimation(remoteAnimationAdapter.getWrapped());