0001-FODCircleView-KeyguardSecurityContainer-don-t-show-F.patch

From a03c1443438111467cb3e2796019b96531e3f3a8 Mon Sep 17 00:00:00 2001
From: Dil3mm4 <[email protected]>
Date: Mon, 30 Nov 2020 04:31:41 +0000
Subject: [PATCH] FODCircleView && KeyguardSecurityContainer: don't show FOD if
 a strong auth is required && don't setup bottommargin if strong auth is
 required

---
 .../src/com/android/keyguard/KeyguardSecurityContainer.java    | 3 +--
 .../src/com/android/systemui/biometrics/FODCircleView.java     | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index 55bd518941f8..1cb0ab2920ed 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -515,11 +515,10 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
 
     @Override
     public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-
         // Consume bottom insets because we're setting the padding locally (for IME and navbar.)
         int inset;
         boolean fodEquipped = mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
-        int minBottomMargin = mUpdateMonitor.isFingerprintDetectionRunning() && fodEquipped ? getResources().getDimensionPixelSize(
+        int minBottomMargin = !mUpdateMonitor.userNeedsStrongAuth() && mUpdateMonitor.isFingerprintDetectionRunning() && fodEquipped ? getResources().getDimensionPixelSize(
                 R.dimen.kg_security_container_min_bottom_margin) : 0;
 
         if (sNewInsetsMode == NEW_INSETS_MODE_FULL) {
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
index 052474cf9507..bee67dea7c33 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
@@ -383,6 +383,9 @@ public class FODCircleView extends ImageView {
     }
 
     public void show() {
+        if (mUpdateMonitor.userNeedsStrongAuth()) {
+            return;
+        }
         if (!mUpdateMonitor.isScreenOn()) {
             // Keyguard is shown just after screen turning off
             return;
-- 
2.20.1