Merge remote-tracking branch 'origin/lineage-23.0' into a16 (ef2220c0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/blueprints/SplitShadeKeyguardBlueprint.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.android.systemui.keyguard.ui.view.layout.sections.DefaultSettingsPopu
		import com.android.systemui.keyguard.ui.view.layout.sections.DefaultShortcutsSection
		import com.android.systemui.keyguard.ui.view.layout.sections.DefaultStatusBarSection
		import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule
		import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSliceViewSection
		import com.android.systemui.keyguard.ui.view.layout.sections.SmartspaceSection
		import com.android.systemui.keyguard.ui.view.layout.sections.SplitShadeGuidelines
		import com.android.systemui.keyguard.ui.view.layout.sections.SplitShadeMediaSection
		@@ -65,6 +66,7 @@ constructor(
		clockSection: ClockSection,
		smartspaceSection: SmartspaceSection,
		mediaSection: SplitShadeMediaSection,
		keyguardSliceViewSection: KeyguardSliceViewSection,
		) : KeyguardBlueprint {
		override val id: String = ID

		@@ -83,6 +85,7 @@ constructor(
		smartspaceSection,
		aodBurnInSection,
		clockSection,
		keyguardSliceViewSection,
		mediaSection,
		defaultDeviceEntrySection, // Add LAST: Intentionally has z-order above other views.
		)

+7 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import androidx.constraintlayout.widget.ConstraintSet.START
		import androidx.constraintlayout.widget.ConstraintSet.TOP
		import com.android.systemui.customization.R as customR
		import com.android.systemui.keyguard.shared.model.KeyguardSection
		import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel
		import com.android.systemui.media.controls.ui.controller.KeyguardMediaController
		import com.android.systemui.res.R
		import com.android.systemui.shade.ShadeDisplayAware
		@@ -40,6 +41,7 @@ class SplitShadeMediaSection
		constructor(
		@ShadeDisplayAware private val context: Context,
		private val keyguardMediaController: KeyguardMediaController,
		private val smartspaceViewModel: KeyguardSmartspaceViewModel,
		) : KeyguardSection() {
		private val mediaContainerId = R.id.status_view_media_container

		@@ -66,7 +68,11 @@ constructor(
		constraintSet.apply {
		constrainWidth(mediaContainerId, MATCH_CONSTRAINT)
		constrainHeight(mediaContainerId, WRAP_CONTENT)
		if (smartspaceViewModel.isSmartspaceEnabled) {
		connect(mediaContainerId, TOP, R.id.smart_space_barrier_bottom, BOTTOM)
		} else {
		connect(mediaContainerId, TOP, R.id.keyguard_slice_view, BOTTOM)
		}
		connect(mediaContainerId, START, PARENT_ID, START)
		connect(mediaContainerId, END, R.id.split_shade_guideline, END)
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ val Kosmos.splitShadeBlueprint by
		clockSection = keyguardClockSection,
		smartspaceSection = keyguardSmartspaceSection,
		mediaSection = mock(),
		keyguardSliceViewSection = mock(),
		accessibilityActionsSection = mock(),
		)
		}