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

Commit 69335a50 authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge "Fix UDFPS not working when a HUN is showing" into sc-v2-dev am: cb4a25f6 

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

Change-Id: Ia4b0e060dbb008ab73d5507a38bb47e19a11436f
parents 8423874e cb4a25f6

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ abstract class UdfpsAnimationView extends FrameLayout { 
        return (int) ((1 - percent) * 255);

    }



    public void onExpansionChanged(float expansion, boolean expanded) {

    public void onExpansionChanged(float expansion) {

        mAlpha = expansionToAlpha(expansion);

        updateAlpha();

    }

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.java

+7 −5
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 
    @NonNull final PanelExpansionStateManager mPanelExpansionStateManager;

    @NonNull final DumpManager mDumpManger;



    boolean mNotificationShadeExpanded;

    boolean mNotificationShadeVisible;



    protected UdfpsAnimationViewController(

            T view,
@@ -85,7 +85,7 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 


    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("mNotificationShadeExpanded=" + mNotificationShadeExpanded);

        pw.println("mNotificationShadeVisible=" + mNotificationShadeVisible);

        pw.println("shouldPauseAuth()=" + shouldPauseAuth());

        pw.println("isPauseAuth=" + mView.isPauseAuth());

    }
@@ -95,7 +95,7 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 
     * authentication.

     */

    boolean shouldPauseAuth() {

        return mNotificationShadeExpanded;

        return mNotificationShadeVisible;

    }



    /**
@@ -182,8 +182,10 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView> 
        @Override

        public void onPanelExpansionChanged(

                float fraction, boolean expanded, boolean tracking) {

            mNotificationShadeExpanded = expanded;

            mView.onExpansionChanged(fraction, expanded);

            // Notification shade can be expanded but not visible (fraction: 0.0), for example

            // when a heads-up notification (HUN) is showing.

            mNotificationShadeVisible = expanded && fraction > 0f;

            mView.onExpansionChanged(fraction);

            updatePauseAuth();

        }

    };

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
            return false;

        }



        if (mUdfpsRequested && !mNotificationShadeExpanded

        if (mUdfpsRequested && !mNotificationShadeVisible

                && (!mIsBouncerVisible

                || mInputBouncerHiddenAmount != KeyguardBouncer.EXPANSION_VISIBLE)) {

            return false;