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

Commit 566b1feb authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Remove CentralSurfaces#isKeyguardShowing. 

Bug: 277764509
Test: compiles
Change-Id: I2e56ef7139a563972829d5ad22f4bbf1397b5c08
parent 1af07d27

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

+0 −2
Original line number Diff line number Diff line
@@ -295,8 +295,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner { 
    @VisibleForTesting

    void updateScrimController();



    boolean isKeyguardShowing();



    boolean shouldIgnoreTouch();



    boolean isDeviceInteractive();

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesEmptyImpl.kt

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ abstract class CentralSurfacesEmptyImpl : CentralSurfaces { 
    override fun setTransitionToFullShadeProgress(transitionToFullShadeProgress: Float) {}

    override fun setPrimaryBouncerHiddenFraction(expansion: Float) {}

    override fun updateScrimController() {}

    override fun isKeyguardShowing() = false

    override fun shouldIgnoreTouch() = false

    override fun isDeviceInteractive() = false

    override fun awakenDreams() {}

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

+3 −10
Original line number Diff line number Diff line
@@ -24,11 +24,9 @@ import static android.app.StatusBarManager.windowStateToString; 
import static android.view.WindowInsetsController.APPEARANCE_LOW_PROFILE_BARS;

import static android.view.WindowInsetsController.APPEARANCE_OPAQUE_STATUS_BARS;

import static android.view.WindowInsetsController.APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS;



import static androidx.core.view.ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_AUTO;

import static androidx.core.view.ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS;

import static androidx.lifecycle.Lifecycle.State.RESUMED;



import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;

import static com.android.systemui.charging.WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL;

import static com.android.systemui.statusbar.NotificationLockscreenUserManager.PERMISSION_SELF;
@@ -1433,7 +1431,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        // - QS is expanded and we're swiping - swiping up now will hide QS, not dismiss the

        //   keyguard.

        // - Shade is in QQS over keyguard - swiping up should take us back to keyguard

        if (!isKeyguardShowing()

        if (!mKeyguardStateController.isShowing()

                || mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()

                || mKeyguardStateController.isOccluded()

                || !mKeyguardStateController.canDismissLockScreen()
@@ -2882,7 +2880,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        if (mDevicePolicyManager.getCameraDisabled(null,

                mLockscreenUserManager.getCurrentUserId())) {

            return false;

        } else if (isKeyguardShowing() && mStatusBarKeyguardViewManager.isSecure()) {

        } else if (mKeyguardStateController.isShowing()

                && mStatusBarKeyguardViewManager.isSecure()) {

            // Check if the admin has disabled the camera specifically for the keyguard

            return (mDevicePolicyManager.getKeyguardDisabledFeatures(null,

                    mLockscreenUserManager.getCurrentUserId())
@@ -2998,12 +2997,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


        Trace.endSection();

    }



    @Override

    public boolean isKeyguardShowing() {

        return mKeyguardStateController.isShowing();

    }



    @Override

    public boolean shouldIgnoreTouch() {

        return (mStatusBarStateController.isDozing()