diff options
4 files changed, 9 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepository.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepository.kt index 053482431bcb..f1c3f949ffba 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepository.kt @@ -323,6 +323,9 @@ constructor( alternateBouncerUIAvailable .logDiffsForTable(buffer, "", "IsAlternateBouncerUIAvailable", false) .launchIn(applicationScope) + alternateBouncerVisible + .logDiffsForTable(buffer, "", "AlternateBouncerVisible", false) + .launchIn(applicationScope) lastShownSecurityMode .map { it.name } .logDiffsForTable(buffer, "", "lastShownSecurityMode", null) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt index 53f013275451..18022a98c69a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt @@ -17,6 +17,7 @@ package com.android.systemui.keyguard.ui.binder import android.graphics.PixelFormat +import android.util.Log import android.view.Gravity import android.view.LayoutInflater import android.view.View @@ -95,11 +96,11 @@ constructor( applicationScope.launch("$TAG#alternateBouncerWindowViewModel") { alternateBouncerWindowViewModel.get().alternateBouncerWindowRequired.collect { addAlternateBouncerWindowView -> + Log.d(TAG, "alternateBouncerWindowRequired=$addAlternateBouncerWindowView") if (addAlternateBouncerWindowView) { addViewToWindowManager() - val scrim = + val scrim: ScrimView = alternateBouncerView!!.requireViewById(R.id.alternate_bouncer_scrim) - as ScrimView scrim.viewAlpha = 0f bind(alternateBouncerView!!, alternateBouncerDependencies.get()) } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 7630d43c3c7e..a584902dbdfc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -2345,6 +2345,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { } else if (mState == StatusBarState.KEYGUARD && !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing() && mStatusBarKeyguardViewManager.isSecure()) { + Log.d(TAG, "showBouncerOrLockScreenIfKeyguard, showingBouncer"); mStatusBarKeyguardViewManager.showBouncer(true /* scrimmed */); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 7301b87d815b..f0dab3ba1829 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -744,6 +744,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb public void showBouncer(boolean scrimmed) { if (DeviceEntryUdfpsRefactor.isEnabled()) { if (mAlternateBouncerInteractor.canShowAlternateBouncerForFingerprint()) { + Log.d(TAG, "showBouncer:alternateBouncer.forceShow()"); mAlternateBouncerInteractor.forceShow(); updateAlternateBouncerShowing(mAlternateBouncerInteractor.isVisibleState()); } else { @@ -869,6 +870,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } if (DeviceEntryUdfpsRefactor.isEnabled()) { + Log.d(TAG, "dismissWithAction:alternateBouncer.forceShow()"); mAlternateBouncerInteractor.forceShow(); updateAlternateBouncerShowing(mAlternateBouncerInteractor.isVisibleState()); } else { |