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

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

Merge "Move the lock_icon_view to the KeyguardRootView" into main

parents 2aa2bed1 b424172b

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 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.Flags.migrateClocksToBlueprint;

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;
@@ -452,7 +453,7 @@ public class LockIconViewController implements Dumpable { 
    private void updateLockIconLocation() {

        final float scaleFactor = mAuthController.getScaleFactor();

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

        if (keyguardBottomAreaRefactor()) {

        if (keyguardBottomAreaRefactor() || migrateClocksToBlueprint()) {

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

                    scaledPadding);

        } else {

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

+7 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.constraintlayout.widget.ConstraintSet 
import com.android.keyguard.LockIconView

import com.android.keyguard.LockIconViewController

import com.android.systemui.Flags.keyguardBottomAreaRefactor

import com.android.systemui.Flags.migrateClocksToBlueprint

import com.android.systemui.biometrics.AuthController

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
@@ -70,7 +71,11 @@ constructor( 
    private val deviceEntryIconViewId = R.id.device_entry_icon_view



    override fun addViews(constraintLayout: ConstraintLayout) {

        if (!keyguardBottomAreaRefactor() && !DeviceEntryUdfpsRefactor.isEnabled) {

        if (

            !keyguardBottomAreaRefactor() &&

                !migrateClocksToBlueprint() &&

                !DeviceEntryUdfpsRefactor.isEnabled

        ) {

            return

        }
@@ -82,7 +87,7 @@ constructor( 
            if (DeviceEntryUdfpsRefactor.isEnabled) {

                DeviceEntryIconView(context, null).apply { id = deviceEntryIconViewId }

            } else {

                // keyguardBottomAreaRefactor()

                // keyguardBottomAreaRefactor() or migrateClocksToBlueprint()

                LockIconView(context, null).apply { id = R.id.lock_icon_view }

            }

        constraintLayout.addView(view)

packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ public class LockIconViewControllerBaseTest extends SysuiTestCase { 
        when(mStatusBarStateController.getState()).thenReturn(StatusBarState.KEYGUARD);



        mSetFlagsRule.disableFlags(Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR);

        mSetFlagsRule.disableFlags(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT);



        mFeatureFlags = new FakeFeatureFlags();

        mFeatureFlags.set(LOCKSCREEN_WALLPAPER_DREAM_ENABLED, false);

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

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ class DefaultDeviceEntrySectionTest : SysuiTestCase() { 


    @Test

    fun addViewsConditionally_migrateFlagOff() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR)

        val constraintLayout = ConstraintLayout(context, null)