Merge cherrypicks of ['googleplex-android-review.googlesource.com/26461184',... (b938b7e1) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -12967,7 +12967,7 @@ package android.service.ondeviceintelligence {
		field public static final String SERVICE_INTERFACE = "android.service.ondeviceintelligence.OnDeviceIntelligenceService";
		}

		public static class OnDeviceIntelligenceService.OnDeviceIntelligenceServiceException extends java.lang.Exception {
		public abstract static class OnDeviceIntelligenceService.OnDeviceIntelligenceServiceException extends java.lang.Exception {
		ctor public OnDeviceIntelligenceService.OnDeviceIntelligenceServiceException(int);
		ctor public OnDeviceIntelligenceService.OnDeviceIntelligenceServiceException(int, @NonNull String);
		method public int getErrorCode();

+5 −0

Original line number	Diff line number	Diff line
		@@ -3281,6 +3281,11 @@ public class PackageImpl implements ParsedPackage, AndroidPackageInternal,
		}

		public PackageImpl(Parcel in) {
		this(in, /* callback */ null);
		}

		public PackageImpl(@NonNull Parcel in, @Nullable ParsingPackageUtils.Callback callback) {
		mCallback = callback;
		// We use the boot classloader for all classes that we load.
		final ClassLoader boot = Object.class.getClassLoader();
		this.supportsSmallScreens = sForBoolean.unparcel(in);

+10 −0

Original line number	Diff line number	Diff line
		@@ -342,6 +342,16 @@ flag {
		bug: "298186160"
		}

		flag {
		name: "activity_transition_use_largest_window"
		namespace: "systemui"
		description: "Target largest opening window during activity transitions."
		bug: "323294573"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "centralized_status_bar_height_fix"
		namespace: "systemui"

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ android_library {
		"androidx.core_core-animation-nodeps",
		"androidx.core_core-ktx",
		"androidx.annotation_annotation",
		"com_android_systemui_flags_lib",
		"SystemUIShaderLib",
		"WindowManager-Shell-shared",
		"animationlib",

+26 −5

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import androidx.annotation.UiThread
		import com.android.app.animation.Interpolators
		import com.android.internal.annotations.VisibleForTesting
		import com.android.internal.policy.ScreenDecorationsUtils
		import com.android.systemui.Flags.activityTransitionUseLargestWindow
		import kotlin.math.roundToInt

		private const val TAG = "ActivityTransitionAnimator"
		@@ -648,6 +649,21 @@ class ActivityTransitionAnimator(
		var candidate: RemoteAnimationTarget? = null
		for (it in apps) {
		if (it.mode == RemoteAnimationTarget.MODE_OPENING) {
		if (activityTransitionUseLargestWindow()) {
		if (
		candidate == null \|\|
		!it.hasAnimatingParent && candidate.hasAnimatingParent
		) {
		candidate = it
		continue
		}
		if (
		!it.hasAnimatingParent &&
		it.screenSpaceBounds.hasGreaterAreaThan(candidate.screenSpaceBounds)
		) {
		candidate = it
		}
		} else {
		if (!it.hasAnimatingParent) {
		return it
		}
		@@ -656,6 +672,7 @@ class ActivityTransitionAnimator(
		}
		}
		}
		}
		return candidate
		}

		@@ -960,5 +977,9 @@ class ActivityTransitionAnimator(
		e.printStackTrace()
		}
		}

		private fun Rect.hasGreaterAreaThan(other: Rect): Boolean {
		return (this.width() * this.height()) > (other.width() * other.height())
		}
		}
		}