Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9866018a authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Update flag check to MigrateClocksToBlueprint" into main

parents aef03313 7f1ca2a2

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

+1 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ public class LockIconViewController implements Dumpable { 
        final float scaleFactor = mAuthController.getScaleFactor();

        final int scaledPadding = (int) (mDefaultPaddingPx * scaleFactor);

        if (KeyguardBottomAreaRefactor.isEnabled() || MigrateClocksToBlueprint.isEnabled()) {

            // positioning in this case is handled by [DefaultDeviceEntrySection]

            mView.getLockIcon().setPadding(scaledPadding, scaledPadding, scaledPadding,

                    scaledPadding);

        } else {

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntrySection.kt

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor 
import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.KeyguardBottomAreaRefactor

import com.android.systemui.keyguard.MigrateClocksToBlueprint

import com.android.systemui.keyguard.shared.model.KeyguardSection

import com.android.systemui.keyguard.ui.binder.DeviceEntryIconViewBinder

import com.android.systemui.keyguard.ui.view.DeviceEntryIconView
@@ -72,7 +73,7 @@ constructor( 
    override fun addViews(constraintLayout: ConstraintLayout) {

        if (

            !KeyguardBottomAreaRefactor.isEnabled &&

                !DeviceEntryUdfpsRefactor.isEnabled &&

                !MigrateClocksToBlueprint.isEnabled &&

                !DeviceEntryUdfpsRefactor.isEnabled

        ) {

            return