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

libs/WindowManager/Shell/src/com/android/wm/shell/transition/MixedTransitionHelper.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -141,10 +141,13 @@ public class MixedTransitionHelper {
		pipHandler.setEnterAnimationType(ANIM_TYPE_ALPHA);
		pipHandler.startEnterAnimation(pipChange, startTransaction, finishTransaction,
		finishCB);
		// make a new finishTransaction because pip's startEnterAnimation "consumes" it so
		// we need a separate one to send over to launcher.
		SurfaceControl.Transaction otherFinishT = new SurfaceControl.Transaction();
		// Dispatch the rest of the transition normally. This will most-likely be taken by
		// recents or default handler.
		mixed.mLeftoversHandler = player.dispatchTransition(mixed.mTransition, everythingElse,
		otherStartT, finishTransaction, finishCB, mixedHandler);
		otherStartT, otherFinishT, finishCB, mixedHandler);
		} else {
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Not leaving split, so just "
		+ "forward animation to Pip-Handler.");

libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/FromSplitScreenEnterPipOnUserLeaveHintTest.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -182,12 +182,6 @@ class FromSplitScreenEnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) :
		}
		}

		/** {@inheritDoc} */
		@FlakyTest(bugId = 312446524)
		@Test
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
		super.visibleLayersShownMoreThanOneConsecutiveEntry()

		/** {@inheritDoc} */
		@Test
		@FlakyTest(bugId = 336510055)

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewClockViewBinder.kt

+9 −6

Original line number	Diff line number	Diff line
		@@ -121,7 +121,10 @@ object KeyguardPreviewClockViewBinder {
		private fun applyClockDefaultConstraints(context: Context, constraints: ConstraintSet) {
		constraints.apply {
		constrainWidth(R.id.lockscreen_clock_view_large, ConstraintSet.WRAP_CONTENT)
		constrainHeight(R.id.lockscreen_clock_view_large, ConstraintSet.MATCH_CONSTRAINT)
		// The following two lines make lockscreen_clock_view_large is constrained to available
		// height when it goes beyond constraints; otherwise, it use WRAP_CONTENT
		constrainHeight(R.id.lockscreen_clock_view_large, WRAP_CONTENT)
		constrainMaxHeight(R.id.lockscreen_clock_view_large, 0)
		val largeClockTopMargin =
		SystemBarUtils.getStatusBarHeight(context) +
		context.resources.getDimensionPixelSize(
		@@ -138,7 +141,7 @@ object KeyguardPreviewClockViewBinder {
		R.id.lockscreen_clock_view_large,
		ConstraintSet.END,
		PARENT_ID,
		ConstraintSet.END
		ConstraintSet.END,
		)

		// In preview, we'll show UDFPS icon for UDFPS devices
		@@ -160,14 +163,14 @@ object KeyguardPreviewClockViewBinder {
		BOTTOM,
		PARENT_ID,
		BOTTOM,
		clockBottomMargin
		clockBottomMargin,
		)
		}

		constrainWidth(R.id.lockscreen_clock_view, WRAP_CONTENT)
		constrainHeight(
		R.id.lockscreen_clock_view,
		context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height)
		context.resources.getDimensionPixelSize(customizationR.dimen.small_clock_height),
		)
		connect(
		R.id.lockscreen_clock_view,
		@@ -175,7 +178,7 @@ object KeyguardPreviewClockViewBinder {
		PARENT_ID,
		START,
		context.resources.getDimensionPixelSize(customizationR.dimen.clock_padding_start) +
		context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal)
		context.resources.getDimensionPixelSize(R.dimen.status_view_margin_horizontal),
		)
		val smallClockTopMargin =
		context.resources.getDimensionPixelSize(R.dimen.keyguard_clock_top_margin) +
		@@ -188,7 +191,7 @@ object KeyguardPreviewClockViewBinder {
		context: Context,
		rootView: ConstraintLayout,
		previewClock: ClockController,
		viewModel: KeyguardPreviewClockViewModel
		viewModel: KeyguardPreviewClockViewModel,
		) {
		val cs = ConstraintSet().apply { clone(rootView) }
		applyClockDefaultConstraints(context, cs)

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -203,13 +203,16 @@ public class NotificationContentInflater implements NotificationRowContentBinder
		messagingStyle = mConversationProcessor
		.processNotification(entry, builder, mLogger);
		}
		result.mInflatedSingleLineViewModel = SingleLineViewInflater
		SingleLineViewModel viewModel = SingleLineViewInflater
		.inflateSingleLineViewModel(
		entry.getSbn().getNotification(),
		messagingStyle,
		builder,
		row.getContext()
		);
		// If the messagingStyle is null, we want to inflate the normal view
		isConversation = viewModel.isConversation();
		result.mInflatedSingleLineViewModel = viewModel;
		result.mInflatedSingleLineView =
		SingleLineViewInflater.inflatePrivateSingleLineView(
		isConversation,

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ui/viewbinder/SingleLineViewBinder.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -24,14 +24,14 @@ import com.android.systemui.statusbar.notification.row.ui.viewmodel.SingleLineVi
		object SingleLineViewBinder {
		@JvmStatic
		fun bind(viewModel: SingleLineViewModel?, view: HybridNotificationView?) {
		if (viewModel?.isConversation() == true && view is HybridConversationNotificationView) {
		if (view is HybridConversationNotificationView) {
		if (AsyncHybridViewInflation.isUnexpectedlyInLegacyMode()) return

		viewModel.conversationData?.avatar?.let { view.setAvatar(it) }
		viewModel?.conversationData?.avatar?.let { view.setAvatar(it) }
		view.setText(
		viewModel.titleText,
		viewModel.contentText,
		viewModel.conversationData?.conversationSenderName
		viewModel?.titleText,
		viewModel?.contentText,
		viewModel?.conversationData?.conversationSenderName,
		)
		} else {
		// bind the title and content text views
		@@ -39,7 +39,7 @@ object SingleLineViewBinder {
		bind(
		/* title = */ viewModel?.titleText,
		/* text = */ viewModel?.contentText,
		/* contentView = */ null
		/* contentView = */ null,
		)
		}
		}