Merge "Move MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA and MIGRATE_LOCK_ICON flags to aconfig" into main (3397af24) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT;
		import static com.android.keyguard.LockIconView.ICON_FINGERPRINT;
		import static com.android.keyguard.LockIconView.ICON_LOCK;
		import static com.android.keyguard.LockIconView.ICON_UNLOCK;
		import static com.android.systemui.Flags.keyguardBottomAreaRefactor;
		import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset;
		import static com.android.systemui.flags.Flags.DOZING_MIGRATION_1;
		import static com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED;
		@@ -459,7 +460,7 @@ public class LockIconViewController implements Dumpable {
		private void updateLockIconLocation() {
		final float scaleFactor = mAuthController.getScaleFactor();
		final int scaledPadding = (int) (mDefaultPaddingPx * scaleFactor);
		if (mFeatureFlags.isEnabled(Flags.MIGRATE_LOCK_ICON)) {
		if (keyguardBottomAreaRefactor()) {
		mView.getLockIcon().setPadding(scaledPadding, scaledPadding, scaledPadding,
		scaledPadding);
		} else {

+0 −13

Original line number	Diff line number	Diff line
		@@ -244,15 +244,6 @@ object Flags {

		/** Keyguard Migration */

		/**
		* Migrate the bottom area to the new keyguard root view. Because there is no such thing as a
		* "bottom area" after this, this also breaks it up into many smaller, modular pieces.
		*/
		// TODO(b/290652751): Tracking bug.
		@JvmField
		val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA =
		unreleasedFlag("migrate_split_keyguard_bottom_area")

		// TODO(b/297037052): Tracking bug.
		@JvmField
		val REMOVE_NPVC_BOTTOM_AREA_USAGE = unreleasedFlag("remove_npvc_bottom_area_usage")
		@@ -264,10 +255,6 @@ object Flags {
		// TODO(b/287268101): Tracking bug.
		@JvmField val TRANSIT_CLOCK = releasedFlag("lockscreen_custom_transit_clock")

		/** Migrate the lock icon view to the new keyguard root view. */
		// TODO(b/286552209): Tracking bug.
		@JvmField val MIGRATE_LOCK_ICON = unreleasedFlag("migrate_lock_icon")

		// TODO(b/288276738): Tracking bug.
		@JvmField val WIDGET_ON_KEYGUARD = unreleasedFlag("widget_on_keyguard")

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import com.android.keyguard.LockIconView
		import com.android.keyguard.LockIconViewController
		import com.android.keyguard.dagger.KeyguardStatusViewComponent
		import com.android.systemui.CoreStartable
		import com.android.systemui.Flags.keyguardBottomAreaRefactor
		import com.android.systemui.common.ui.ConfigurationState
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor
		@@ -113,7 +114,7 @@ constructor(
		fun bindIndicationArea() {
		indicationAreaHandle?.dispose()

		if (!featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
		if (!keyguardBottomAreaRefactor()) {
		keyguardRootView.findViewById<View?>(R.id.keyguard_indication_area)?.let {
		keyguardRootView.removeView(it)
		}
		@@ -125,7 +126,6 @@ constructor(
		keyguardIndicationAreaViewModel,
		keyguardRootViewModel,
		indicationController,
		featureFlags,
		)
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -22,9 +22,8 @@ import android.view.ViewGroup
		import android.widget.TextView
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.systemui.Flags.keyguardBottomAreaRefactor
		import com.android.systemui.res.R
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.ui.viewmodel.KeyguardIndicationAreaViewModel
		import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
		import com.android.systemui.lifecycle.repeatWhenAttached
		@@ -54,7 +53,6 @@ object KeyguardIndicationAreaBinder {
		viewModel: KeyguardIndicationAreaViewModel,
		keyguardRootViewModel: KeyguardRootViewModel,
		indicationController: KeyguardIndicationController,
		featureFlags: FeatureFlags,
		): DisposableHandle {
		val indicationArea: ViewGroup = view.requireViewById(R.id.keyguard_indication_area)
		indicationController.setIndicationArea(indicationArea)
		@@ -71,7 +69,7 @@ object KeyguardIndicationAreaBinder {
		view.repeatWhenAttached {
		repeatOnLifecycle(Lifecycle.State.STARTED) {
		launch {
		if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
		if (keyguardBottomAreaRefactor()) {
		keyguardRootViewModel.alpha.collect { alpha ->
		indicationArea.apply {
		this.importantForAccessibility =

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import com.android.app.animation.Interpolators
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD
		import com.android.keyguard.KeyguardClockSwitch.MISSING_CLOCK_ID
		import com.android.systemui.Flags.keyguardBottomAreaRefactor
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.common.shared.model.Text
		import com.android.systemui.common.shared.model.TintedIcon
		@@ -111,7 +112,7 @@ object KeyguardRootViewBinder {
		}
		}

		if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
		if (keyguardBottomAreaRefactor()) {
		launch { viewModel.alpha.collect { alpha -> view.alpha = alpha } }
		}