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

Commit ee83b95c authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Use falsing manager on click to open user switcher" into sc-dev am: e17c5549

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14314191

Change-Id: Iff9598e48a8dd2c78f16147aa090f44eaa9fdeab
parents bc5a6a42 e17c5549
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.settingslib.drawable.CircleFramedDrawable;
import com.android.systemui.R;
import com.android.systemui.R;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.keyguard.ScreenLifecycle;
import com.android.systemui.keyguard.ScreenLifecycle;
import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.SysuiStatusBarStateController;
import com.android.systemui.statusbar.SysuiStatusBarStateController;
import com.android.systemui.statusbar.notification.AnimatableProperty;
import com.android.systemui.statusbar.notification.AnimatableProperty;
@@ -67,6 +68,7 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
    private final ScreenLifecycle mScreenLifecycle;
    private final ScreenLifecycle mScreenLifecycle;
    private UserSwitcherController.BaseUserAdapter mAdapter;
    private UserSwitcherController.BaseUserAdapter mAdapter;
    private final KeyguardStateController mKeyguardStateController;
    private final KeyguardStateController mKeyguardStateController;
    private final FalsingManager mFalsingManager;
    protected final SysuiStatusBarStateController mStatusBarStateController;
    protected final SysuiStatusBarStateController mStatusBarStateController;
    private final ConfigurationController mConfigurationController;
    private final ConfigurationController mConfigurationController;
    private final KeyguardVisibilityHelper mKeyguardVisibilityHelper;
    private final KeyguardVisibilityHelper mKeyguardVisibilityHelper;
@@ -115,6 +117,7 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
            ScreenLifecycle screenLifecycle,
            ScreenLifecycle screenLifecycle,
            UserSwitcherController userSwitcherController,
            UserSwitcherController userSwitcherController,
            KeyguardStateController keyguardStateController,
            KeyguardStateController keyguardStateController,
            FalsingManager falsingManager,
            ConfigurationController configurationController,
            ConfigurationController configurationController,
            SysuiStatusBarStateController statusBarStateController,
            SysuiStatusBarStateController statusBarStateController,
            DozeParameters dozeParameters,
            DozeParameters dozeParameters,
@@ -127,6 +130,7 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
        mScreenLifecycle = screenLifecycle;
        mScreenLifecycle = screenLifecycle;
        mUserSwitcherController = userSwitcherController;
        mUserSwitcherController = userSwitcherController;
        mKeyguardStateController = keyguardStateController;
        mKeyguardStateController = keyguardStateController;
        mFalsingManager = falsingManager;
        mConfigurationController = configurationController;
        mConfigurationController = configurationController;
        mStatusBarStateController = statusBarStateController;
        mStatusBarStateController = statusBarStateController;
        mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView,
        mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView,
@@ -147,6 +151,10 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
        };
        };


        mView.setOnClickListener(v -> {
        mView.setOnClickListener(v -> {
            if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
                return;
            }

            if (isListAnimating()) {
            if (isListAnimating()) {
                return;
                return;
            }
            }