Merge "[flexiglass] Adds flag refactor wrappers." into main (1e998835) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/LockSection.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,12 +32,12 @@ import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.SceneScope
		import com.android.keyguard.LockIconView
		import com.android.keyguard.LockIconViewController
		import com.android.systemui.Flags.keyguardBottomAreaRefactor
		import com.android.systemui.biometrics.AuthController
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
		import com.android.systemui.flags.FeatureFlagsClassic
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.KeyguardBottomAreaRefactor
		import com.android.systemui.keyguard.ui.binder.DeviceEntryIconViewBinder
		import com.android.systemui.keyguard.ui.composable.blueprint.BlueprintAlignmentLines
		import com.android.systemui.keyguard.ui.view.DeviceEntryIconView
		@@ -69,7 +69,7 @@ constructor(
		) {
		@Composable
		fun SceneScope.LockIcon(modifier: Modifier = Modifier) {
		if (!keyguardBottomAreaRefactor() && !DeviceEntryUdfpsRefactor.isEnabled) {
		if (!KeyguardBottomAreaRefactor.isEnabled && !DeviceEntryUdfpsRefactor.isEnabled) {
		return
		}

		@@ -96,7 +96,7 @@ constructor(
		)
		}
		} else {
		// keyguardBottomAreaRefactor()
		// KeyguardBottomAreaRefactor.isEnabled
		LockIconView(context, null).apply {
		id = R.id.lock_icon_view
		lockIconViewController.get().setLockIconView(this)

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ import android.view.ViewGroup
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import com.android.compose.animation.scene.SceneScope
		import com.android.systemui.Flags.migrateClocksToBlueprint
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.MigrateClocksToBlueprint
		import com.android.systemui.notifications.ui.composable.NotificationStack
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout
		import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer
		@@ -42,8 +42,8 @@ constructor(
		) {

		init {
		if (!migrateClocksToBlueprint()) {
		throw IllegalStateException("this requires migrateClocksToBlueprint()")
		if (!MigrateClocksToBlueprint.isEnabled) {
		throw IllegalStateException("this requires MigrateClocksToBlueprint.isEnabled")
		}
		// This scene container section moves the NSSL to the SharedNotificationContainer.
		// This also requires that SharedNotificationContainer gets moved to the

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener
		import androidx.annotation.VisibleForTesting
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.systemui.Flags.migrateClocksToBlueprint
		import com.android.systemui.broadcast.BroadcastDispatcher
		import com.android.systemui.customization.R
		import com.android.systemui.dagger.qualifiers.Background
		@@ -39,6 +38,7 @@ import com.android.systemui.dagger.qualifiers.DisplaySpecific
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.flags.FeatureFlagsClassic
		import com.android.systemui.flags.Flags.REGION_SAMPLING
		import com.android.systemui.keyguard.MigrateClocksToBlueprint
		import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.shared.model.KeyguardState.AOD
		@@ -328,7 +328,7 @@ constructor(
		object : KeyguardUpdateMonitorCallback() {
		override fun onKeyguardVisibilityChanged(visible: Boolean) {
		isKeyguardVisible = visible
		if (!migrateClocksToBlueprint()) {
		if (!MigrateClocksToBlueprint.isEnabled) {
		if (!isKeyguardVisible) {
		clock?.run {
		smallClock.animations.doze(if (isDozing) 1f else 0f)
		@@ -368,7 +368,7 @@ constructor(
		}

		private fun refreshTime() {
		if (!migrateClocksToBlueprint()) {
		if (!MigrateClocksToBlueprint.isEnabled) {
		return
		}

		@@ -427,7 +427,7 @@ constructor(
		parent.repeatWhenAttached {
		repeatOnLifecycle(Lifecycle.State.CREATED) {
		listenForDozing(this)
		if (migrateClocksToBlueprint()) {
		if (MigrateClocksToBlueprint.isEnabled) {
		listenForDozeAmountTransition(this)
		listenForAnyStateToAodTransition(this)
		} else {

packages/SystemUI/src/com/android/keyguard/ConnectedDisplayKeyguardPresentation.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import android.view.WindowManager
		import android.widget.FrameLayout
		import android.widget.FrameLayout.LayoutParams
		import com.android.keyguard.dagger.KeyguardStatusViewComponent
		import com.android.systemui.Flags.migrateClocksToBlueprint
		import com.android.systemui.keyguard.MigrateClocksToBlueprint
		import com.android.systemui.plugins.clocks.ClockController
		import com.android.systemui.plugins.clocks.ClockFaceController
		import com.android.systemui.res.R
		@@ -95,7 +95,7 @@ constructor(
		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)

		if (migrateClocksToBlueprint()) {
		if (MigrateClocksToBlueprint.isEnabled) {
		onCreateV2()
		} else {
		onCreate()
		@@ -132,7 +132,7 @@ constructor(
		}

		override fun onAttachedToWindow() {
		if (migrateClocksToBlueprint()) {
		if (MigrateClocksToBlueprint.isEnabled) {
		clockRegistry.registerClockChangeListener(clockChangedListener)
		clockEventController.registerListeners(clock!!)

		@@ -141,7 +141,7 @@ constructor(
		}

		override fun onDetachedFromWindow() {
		if (migrateClocksToBlueprint()) {
		if (MigrateClocksToBlueprint.isEnabled) {
		clockEventController.unregisterListeners()
		clockRegistry.unregisterClockChangeListener(clockChangedListener)
		}

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@ package com.android.keyguard;
		import static com.android.keyguard.KeyguardStatusAreaView.TRANSLATE_X_CLOCK_DESIGN;
		import static com.android.keyguard.KeyguardStatusAreaView.TRANSLATE_Y_CLOCK_DESIGN;
		import static com.android.keyguard.KeyguardStatusAreaView.TRANSLATE_Y_CLOCK_SIZE;
		import static com.android.systemui.Flags.migrateClocksToBlueprint;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		@@ -23,6 +22,7 @@ import androidx.core.content.res.ResourcesCompat;

		import com.android.app.animation.Interpolators;
		import com.android.keyguard.dagger.KeyguardStatusViewScope;
		import com.android.systemui.keyguard.MigrateClocksToBlueprint;
		import com.android.systemui.log.LogBuffer;
		import com.android.systemui.log.core.LogLevel;
		import com.android.systemui.plugins.clocks.ClockController;
		@@ -192,7 +192,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();
		if (!migrateClocksToBlueprint()) {
		if (!MigrateClocksToBlueprint.isEnabled()) {
		mSmallClockFrame = findViewById(R.id.lockscreen_clock_view);
		mLargeClockFrame = findViewById(R.id.lockscreen_clock_view_large);
		mStatusArea = findViewById(R.id.keyguard_status_area);
		@@ -266,7 +266,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
		}

		void updateClockTargetRegions() {
		if (migrateClocksToBlueprint()) {
		if (MigrateClocksToBlueprint.isEnabled()) {
		return;
		}
		if (mClock != null) {