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

Commit 87cb6ac9 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Migrate legacy ALTERNATE_BOUNCER_VIEW to aconfig 

Use aconfig flag com.android.systemui.device_entry_udfps_refactor.

Test: atest SystemUITests
Bug: 279440316
Bug: 287599719
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT
Change-Id: I6bf6af9f4fc1daa2310eebe8fbc60cf559633398
parent 714e2800

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −5
Original line number Diff line number Diff line
@@ -280,11 +280,6 @@ object Flags { 
            R.bool.flag_stop_pulsing_face_scanning_animation,

            "stop_pulsing_face_scanning_animation")



    /** Flag to use a separate view for the alternate bouncer. */

    // TODO(b/300440924): Tracking bug

    @JvmField

    val ALTERNATE_BOUNCER_VIEW: UnreleasedFlag = unreleasedFlag("alternate_bouncer_view")



    // 300 - power menu

    // TODO(b/254512600): Tracking Bug

    @JvmField val POWER_MENU_LITE = releasedFlag("power_menu_lite")

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt

+4 −5
Original line number Diff line number Diff line
@@ -23,18 +23,17 @@ import androidx.lifecycle.repeatOnLifecycle 
import com.android.systemui.CoreStartable

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.flags.FeatureFlagsClassic

import com.android.systemui.flags.Flags

import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor

import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerViewModel

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.res.R

import com.android.systemui.scrim.ScrimView

import com.android.systemui.shade.NotificationShadeWindowView

import com.android.systemui.statusbar.NotificationShadeWindowController

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.launch

import javax.inject.Inject



@ExperimentalCoroutinesApi

@SysUISingleton
@@ -42,13 +41,12 @@ class AlternateBouncerBinder 
@Inject

constructor(

    private val notificationShadeWindowView: NotificationShadeWindowView,

    private val featureFlags: FeatureFlagsClassic,

    private val alternateBouncerViewModel: AlternateBouncerViewModel,

    @Application private val scope: CoroutineScope,

    private val notificationShadeWindowController: NotificationShadeWindowController,

) : CoreStartable {

    override fun start() {

        if (!featureFlags.isEnabled(Flags.ALTERNATE_BOUNCER_VIEW)) {

        if (!DeviceEntryUdfpsRefactor.isEnabled) {

            return

        }
@@ -79,6 +77,7 @@ object AlternateBouncerViewBinder { 
        scope: CoroutineScope,

        notificationShadeWindowController: NotificationShadeWindowController,

    ) {

        DeviceEntryUdfpsRefactor.isUnexpectedlyInLegacyMode()

        scope.launch {

            // forcePluginOpen is necessary to show over occluded apps.

            // This cannot be tied to the view's lifecycle because setting this allows the view

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.systemui.communal.data.repository.CommunalRepository; 
import com.android.systemui.communal.ui.viewmodel.CommunalViewModel;

import com.android.systemui.compose.ComposeFacade;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlagsClassic;
@@ -448,7 +449,7 @@ public class NotificationShadeWindowViewController implements Dumpable { 
                }



                boolean bouncerShowing;

                if (mFeatureFlagsClassic.isEnabled(Flags.ALTERNATE_BOUNCER_VIEW)) {

                if (DeviceEntryUdfpsRefactor.isEnabled()) {

                    bouncerShowing = mPrimaryBouncerInteractor.isBouncerShowing()

                            || mAlternateBouncerInteractor.isVisibleState();

                } else {

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.dagger.qualifiers.UiBackground;

import com.android.systemui.demomode.DemoMode;

import com.android.systemui.demomode.DemoModeController;

import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor;

import com.android.systemui.emergency.EmergencyGesture;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;
@@ -2777,7 +2778,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mScrimController.setExpansionAffectsAlpha(!unlocking);



        if (mAlternateBouncerInteractor.isVisibleState()) {

            if (!mFeatureFlags.isEnabled(Flags.ALTERNATE_BOUNCER_VIEW)) {

            if (!DeviceEntryUdfpsRefactor.isEnabled()) {

                if ((!mKeyguardStateController.isOccluded() || mShadeSurface.isPanelExpanded())

                        && (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED

                        || mTransitionToFullShadeProgress > 0f)) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+3 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor; 
import com.android.systemui.bouncer.ui.BouncerView;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dreams.DreamOverlayStateController;

import com.android.systemui.flags.FeatureFlags;
@@ -1573,7 +1574,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
     * notification shade's child views.

     */

    public boolean shouldInterceptTouchEvent(MotionEvent event) {

        if (mFlags.isEnabled(Flags.ALTERNATE_BOUNCER_VIEW)) {

        if (DeviceEntryUdfpsRefactor.isEnabled()) {

            return false;

        }

        return mAlternateBouncerInteractor.isVisibleState();
@@ -1584,7 +1585,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
     * showing.

     */

    public boolean onTouch(MotionEvent event) {

        if (mFlags.isEnabled(Flags.ALTERNATE_BOUNCER_VIEW)) {

        if (DeviceEntryUdfpsRefactor.isEnabled()) {

            return false;

        }