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

Commit f9098dc4 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Reshow keyguard if keyguard going away anim is cancelled 

Disable `migrate_clocks_to_blueprint` and enable
`device_entry_udfps_refactor` flag.

Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor TEAMFOOD
Test: manually swipe up and back down to hide then reshow
an unlocked keyguard. observe that unlock icon is visible
Fixes: 329355622

Change-Id: I725778c6df234295db76b18d88256127971e7e0e
parent 75865d60

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −1
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ import com.android.systemui.broadcast.BroadcastDispatcher; 
import com.android.systemui.classifier.FalsingCollector;

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

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

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

import com.android.systemui.dreams.DreamOverlayStateController;

import com.android.systemui.dreams.ui.viewmodel.DreamViewModel;

import com.android.systemui.dump.DumpManager;
@@ -3404,7 +3405,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 


        // Ensure that keyguard becomes visible if the going away animation is canceled

        if (showKeyguard && !KeyguardWmStateRefactor.isEnabled()

                && MigrateClocksToBlueprint.isEnabled()) {

                && (MigrateClocksToBlueprint.isEnabled()

                    || DeviceEntryUdfpsRefactor.isEnabled())) {

            mKeyguardInteractor.showKeyguard();

        }

    }