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

Commit 9b909ac7 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents fbe64990 75137cdb

packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBar.java

+5 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; 
import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.InitController;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.biometrics.FODCircleViewImpl;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.colorextraction.SysuiColorExtractor;
@@ -184,7 +185,8 @@ public class UnusedStatusBar extends StatusBar { 
            DismissCallbackRegistry dismissCallbackRegistry,

            Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            TunerService tunerService) {

            TunerService tunerService,

            FODCircleViewImpl fodCircleViewImpl) {

        super(context, notificationsController, lightBarController, autoHideController,

                keyguardUpdateMonitor, statusBarIconController, pulseExpansionHandler,

                notificationWakeUpCoordinator, keyguardBypassController, keyguardStateController,
@@ -211,7 +213,8 @@ public class UnusedStatusBar extends StatusBar { 
                userInfoControllerImpl, phoneStatusBarPolicy, keyguardIndicationController,

                dismissCallbackRegistry, notificationShadeDepthControllerLazy,

                statusBarTouchableRegionManager,

                tunerService);

                tunerService,

                fodCircleViewImpl);

    }



    @Override

packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBarModule.java

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; 
import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.InitController;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.biometrics.FODCircleViewImpl;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.colorextraction.SysuiColorExtractor;
@@ -204,7 +205,8 @@ public interface UnusedStatusBarModule { 
            Lazy<NotificationShadeDepthController> notificationShadeDepthController,

            DismissCallbackRegistry dismissCallbackRegistry,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            TunerService tunerService) {

            TunerService tunerService,

            FODCircleViewImpl fodCircleViewImpl) {

        return new UnusedStatusBar(

                context,

                notificationsController,
@@ -283,6 +285,7 @@ public interface UnusedStatusBarModule { 
                dismissCallbackRegistry,

                notificationShadeDepthController,

                statusBarTouchableRegionManager,

                tunerService);

                tunerService,

                fodCircleViewImpl);

    }

}

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

+8 −1
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ import com.android.systemui.util.RingerModeTracker; 


import com.google.android.collect.Lists;



import lineageos.app.LineageContextConstants;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.ref.WeakReference;
@@ -310,6 +312,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    };



    private final Handler mHandler;

    private final boolean mHasFod;



    private final Observer<Integer> mRingerModeObserver = new Observer<Integer>() {

        @Override
@@ -1693,6 +1696,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            }

        };



        mHasFod = mContext.getPackageManager().hasSystemFeature(

                LineageContextConstants.Features.FOD);



        // Since device can't be un-provisioned, we only need to register a content observer

        // to update mDeviceProvisioned when we are...

        if (!mDeviceProvisioned) {
@@ -1856,7 +1862,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            return;

        }

        mHandler.removeCallbacks(mRetryFingerprintAuthentication);

        boolean shouldListenForFingerprint = shouldListenForFingerprint();

        boolean hideFodForStrongAuth = mHasFod && userNeedsStrongAuth();

        boolean shouldListenForFingerprint = !hideFodForStrongAuth && shouldListenForFingerprint();

        boolean runningOrRestarting = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING

                || mFingerprintRunningState == BIOMETRIC_STATE_CANCELLING_RESTARTING;

        if (runningOrRestarting && !shouldListenForFingerprint) {