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

Commit 7f1ca2a2 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Update flag check to MigrateClocksToBlueprint 

Make sure we add the lock icon view to the KeyguardRootView
if the migrate clocks to blueprint flag is enabled.

Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint TEAMFOOD
Fixes: 331607331
Test: manually disable udfps refactor + keyguard bottom area
refactor flags. enable migrate clocks to blueprint flag

Change-Id: I07cd77f035e6a4630c77dd26b4a502a8c36d5033
parent bc9c179f

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