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

Commit a4ee4cff authored by Beverly's avatar Beverly
Browse files

Add extra logs for alternateBouncer visibility 

Bug: 336845735
Flag: None
Test: see logs in logcat
Change-Id: I9f0a124c383b558ad9712abde26c1e5a35717952
parent 929ab9fd

packages/SystemUI/src/com/android/systemui/bouncer/data/repository/KeyguardBouncerRepository.kt

+3 −0
Original line number Diff line number Diff line
@@ -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)

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt

+3 −2
Original line number Diff line number Diff line
@@ -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 {

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

+1 −0
Original line number Diff line number Diff line
@@ -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 */);

            }

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -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 {