Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia4b0e060dbb008ab73d5507a38bb47e19a11436f
This commit is contained in:
Ilya Matyukhin
2021-11-15 21:34:57 +00:00
committed by Automerger Merge Worker
parent 8423874e7b cb4a25f6df
commit 69335a5067
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java
View File

@@ -111,7 +111,7 @@ abstract class UdfpsAnimationView extends FrameLayout {
return (int) ((1 - percent) * 255); return (int) ((1 - percent) * 255);
} }
public void onExpansionChanged(float expansion, boolean expanded) { public void onExpansionChanged(float expansion) {
mAlpha = expansionToAlpha(expansion); mAlpha = expansionToAlpha(expansion);
updateAlpha(); updateAlpha();
} }

12
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.java
View File

@@ -46,7 +46,7 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView>
@NonNull final PanelExpansionStateManager mPanelExpansionStateManager; @NonNull final PanelExpansionStateManager mPanelExpansionStateManager;
@NonNull final DumpManager mDumpManger; @NonNull final DumpManager mDumpManger;
boolean mNotificationShadeExpanded; boolean mNotificationShadeVisible;
protected UdfpsAnimationViewController( protected UdfpsAnimationViewController(
T view, T view,
@@ -85,7 +85,7 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView>
@Override @Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
pw.println("mNotificationShadeExpanded=" + mNotificationShadeExpanded); pw.println("mNotificationShadeVisible=" + mNotificationShadeVisible);
pw.println("shouldPauseAuth()=" + shouldPauseAuth()); pw.println("shouldPauseAuth()=" + shouldPauseAuth());
pw.println("isPauseAuth=" + mView.isPauseAuth()); pw.println("isPauseAuth=" + mView.isPauseAuth());
} }
@@ -95,7 +95,7 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView>
* authentication. * authentication.
*/ */
boolean shouldPauseAuth() { boolean shouldPauseAuth() {
return mNotificationShadeExpanded; return mNotificationShadeVisible;
} }
/** /**
@@ -182,8 +182,10 @@ abstract class UdfpsAnimationViewController<T extends UdfpsAnimationView>
@Override @Override
public void onPanelExpansionChanged( public void onPanelExpansionChanged(
float fraction, boolean expanded, boolean tracking) { float fraction, boolean expanded, boolean tracking) {
mNotificationShadeExpanded = expanded; // Notification shade can be expanded but not visible (fraction: 0.0), for example
mView.onExpansionChanged(fraction, expanded); // when a heads-up notification (HUN) is showing.
mNotificationShadeVisible = expanded && fraction > 0f;
mView.onExpansionChanged(fraction);
updatePauseAuth(); updatePauseAuth();
} }
}; };

2
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
View File

@@ -211,7 +211,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
return false; return false;
} }
if (mUdfpsRequested && !mNotificationShadeExpanded if (mUdfpsRequested && !mNotificationShadeVisible
&& (!mIsBouncerVisible && (!mIsBouncerVisible
|| mInputBouncerHiddenAmount != KeyguardBouncer.EXPANSION_VISIBLE)) { || mInputBouncerHiddenAmount != KeyguardBouncer.EXPANSION_VISIBLE)) {
return false; return false;