Merge changes from topic "sysui_flags_drop" into pi-dev (59ff5239) · Commits · e / os / android_frameworks_base

config/hiddenapi-vendor-list.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -534,8 +534,7 @@ Landroid/view/IRecentsAnimationController;->screenshotTask(I)Landroid/app/Activi
		Landroid/view/IRecentsAnimationController;->setInputConsumerEnabled(Z)V
		Landroid/view/IRecentsAnimationRunner$Stub;-><init>()V
		Landroid/view/IRecentsAnimationRunner;->onAnimationCanceled()V
		Landroid/view/IRecentsAnimationRunner;->onAnimationStart(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;)V
		Landroid/view/IRecentsAnimationRunner;->onAnimationStart_New(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;Landroid/graphics/Rect;Landroid/graphics/Rect;)V
		Landroid/view/IRecentsAnimationRunner;->onAnimationStart(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;Landroid/graphics/Rect;Landroid/graphics/Rect;)V
		Landroid/view/IRemoteAnimationFinishedCallback;->onAnimationFinished()V
		Landroid/view/IRemoteAnimationRunner$Stub;-><init>()V
		Landroid/view/IRemoteAnimationRunner;->onAnimationCancelled()V

core/java/android/app/ActivityManager.java

+28 −2

Original line number	Diff line number	Diff line
		@@ -2110,9 +2110,12 @@ public class ActivityManager {
		private final boolean mIsRealSnapshot;
		private final int mWindowingMode;
		private final float mScale;
		private final int mSystemUiVisibility;
		private final boolean mIsTranslucent;

		public TaskSnapshot(GraphicBuffer snapshot, int orientation, Rect contentInsets,
		boolean reducedResolution, float scale, boolean isRealSnapshot, int windowingMode) {
		boolean reducedResolution, float scale, boolean isRealSnapshot, int windowingMode,
		int systemUiVisibility, boolean isTranslucent) {
		mSnapshot = snapshot;
		mOrientation = orientation;
		mContentInsets = new Rect(contentInsets);
		@@ -2120,6 +2123,8 @@ public class ActivityManager {
		mScale = scale;
		mIsRealSnapshot = isRealSnapshot;
		mWindowingMode = windowingMode;
		mSystemUiVisibility = systemUiVisibility;
		mIsTranslucent = isTranslucent;
		}

		private TaskSnapshot(Parcel source) {
		@@ -2130,6 +2135,8 @@ public class ActivityManager {
		mScale = source.readFloat();
		mIsRealSnapshot = source.readBoolean();
		mWindowingMode = source.readInt();
		mSystemUiVisibility = source.readInt();
		mIsTranslucent = source.readBoolean();
		}

		/**
		@@ -2169,6 +2176,13 @@ public class ActivityManager {
		return mIsRealSnapshot;
		}

		/**
		* @return Whether or not the snapshot is of a translucent app window.
		*/
		public boolean isTranslucent() {
		return mIsTranslucent;
		}

		/**
		* @return The windowing mode of the task when this snapshot was taken.
		*/
		@@ -2176,6 +2190,14 @@ public class ActivityManager {
		return mWindowingMode;
		}

		/**
		* @return The system ui visibility flags for the top most visible fullscreen window at the
		* time that the snapshot was taken.
		*/
		public int getSystemUiVisibility() {
		return mSystemUiVisibility;
		}

		/**
		* @return The scale this snapshot was taken in.
		*/
		@@ -2197,6 +2219,8 @@ public class ActivityManager {
		dest.writeFloat(mScale);
		dest.writeBoolean(mIsRealSnapshot);
		dest.writeInt(mWindowingMode);
		dest.writeInt(mSystemUiVisibility);
		dest.writeBoolean(mIsTranslucent);
		}

		@Override
		@@ -2207,7 +2231,9 @@ public class ActivityManager {
		+ " mOrientation=" + mOrientation
		+ " mContentInsets=" + mContentInsets.toShortString()
		+ " mReducedResolution=" + mReducedResolution + " mScale=" + mScale
		+ " mIsRealSnapshot=" + mIsRealSnapshot + " mWindowingMode=" + mWindowingMode;
		+ " mIsRealSnapshot=" + mIsRealSnapshot + " mWindowingMode=" + mWindowingMode
		+ " mSystemUiVisibility=" + mSystemUiVisibility
		+ " mIsTranslucent=" + mIsTranslucent;
		}

		public static final Creator<TaskSnapshot> CREATOR = new Creator<TaskSnapshot>() {

core/java/android/view/IRecentsAnimationRunner.aidl

+1 −7

Original line number	Diff line number	Diff line
		@@ -28,12 +28,6 @@ import android.view.IRecentsAnimationController;
		*/
		oneway interface IRecentsAnimationRunner {

		/**
		* Deprecated, to be removed once Launcher updates
		*/
		void onAnimationStart(in IRecentsAnimationController controller,
		in RemoteAnimationTarget[] apps) = 0;

		/**
		* Called when the system needs to cancel the current animation. This can be due to the
		* wallpaper not drawing in time, or the handler not finishing the animation within a predefined
		@@ -48,7 +42,7 @@ oneway interface IRecentsAnimationRunner {
		* @param minimizedHomeBounds Specifies the bounds of the minimized home app, will be
		* {@code null} if the device is not currently in split screen
		*/
		void onAnimationStart_New(in IRecentsAnimationController controller,
		void onAnimationStart(in IRecentsAnimationController controller,
		in RemoteAnimationTarget[] apps, in Rect homeContentInsets,
		in Rect minimizedHomeBounds) = 2;
		}

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -33,7 +33,9 @@ public class ThumbnailData {
		public Rect insets;
		public boolean reducedResolution;
		public boolean isRealSnapshot;
		public boolean isTranslucent;
		public int windowingMode;
		public int systemUiVisibility;
		public float scale;

		public ThumbnailData() {
		@@ -43,7 +45,9 @@ public class ThumbnailData {
		reducedResolution = false;
		scale = 1f;
		isRealSnapshot = true;
		isTranslucent = false;
		windowingMode = WINDOWING_MODE_UNDEFINED;
		systemUiVisibility = 0;
		}

		public ThumbnailData(TaskSnapshot snapshot) {
		@@ -53,6 +57,8 @@ public class ThumbnailData {
		reducedResolution = snapshot.isReducedResolution();
		scale = snapshot.getScale();
		isRealSnapshot = snapshot.isRealSnapshot();
		isTranslucent = snapshot.isTranslucent();
		windowingMode = snapshot.getWindowingMode();
		systemUiVisibility = snapshot.getSystemUiVisibility();
		}
		}

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -219,13 +219,6 @@ public class ActivityManagerWrapper {
		if (animationHandler != null) {
		runner = new IRecentsAnimationRunner.Stub() {
		public void onAnimationStart(IRecentsAnimationController controller,
		RemoteAnimationTarget[] apps) {
		final Rect stableInsets = new Rect();
		WindowManagerWrapper.getInstance().getStableInsets(stableInsets);
		onAnimationStart_New(controller, apps, stableInsets, null);
		}

		public void onAnimationStart_New(IRecentsAnimationController controller,
		RemoteAnimationTarget[] apps, Rect homeContentInsets,
		Rect minimizedHomeBounds) {
		final RecentsAnimationControllerCompat controllerCompat =