FOD: update patch based on PixelExperience/frameworks_base@aed511b, PixelExperience/frameworks_base@4e0b7db and PixelExperience/frameworks_base@74e8900

Author: ponces

patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch

@@ -18,6 +18,7 @@ Change-Id: I4650cef96617c32e52d5dd088c8afffb06ab5e1d
  packages/SystemUI/res/values/config.xml       |   1 -
  .../SystemUI/res/values/custom_config.xml     |   4 -
  .../keyguard/KeyguardSecurityContainer.java   |  15 +-
+ .../keyguard/KeyguardUpdateMonitor.java       |  15 +-
  .../systemui/biometrics/FODCircleView.java    | 544 ------------------
  .../biometrics/FODCircleViewImpl.java         | 128 -----
  .../biometrics/FODCircleViewImplCallback.java |  25 -
@@ -35,7 +36,9 @@ Change-Id: I4650cef96617c32e52d5dd088c8afffb06ab5e1d
  .../biometrics/BiometricServiceBase.java      |   2 +-
  .../fingerprint/FingerprintService.java       | 112 ----
  .../statusbar/StatusBarManagerService.java    |  22 -
- 28 files changed, 14 insertions(+), 1073 deletions(-)
+ .../statusbar/UnusedStatusBar.java            |   7 +-
+ .../statusbar/UnusedStatusBarModule.java      |   7 +-
+ 31 files changed, 22 insertions(+), 1094 deletions(-)
  delete mode 100644 packages/SystemUI/res-keyguard/values/custom_dimens.xml
  delete mode 100644 packages/SystemUI/res/drawable-nodpi/fod_icon_pressed.png
  delete mode 100644 packages/SystemUI/res/drawable/fod_icon_default.xml
@@ -278,6 +281,73 @@ index cc03b4f816a..1db2e32b8cd 100644
          return insets.inset(0, 0, 0, inset);
      }
 
+diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+index 3fe3d863666..c124ee6840e 100644
+--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
++++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+@@ -131,8 +131,6 @@ import javax.inject.Singleton;
+ import com.android.internal.util.custom.faceunlock.FaceUnlockUtils;
+ import com.android.internal.util.custom.fod.FodUtils;
+ 
+-import com.android.internal.util.custom.fod.FodUtils;
+-
+ /**
+  * Watches for updates that may be interesting to the keyguard, and provides
+  * the up to date information as well as a registration for callbacks that care
+@@ -339,8 +337,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
+         }
+     };
+ 
+-    private boolean mHasFod;
+-
+     private PocketManager mPocketManager;
+     private boolean mIsDeviceInPocket;
+     private final IPocketCallback mPocketCallback = new IPocketCallback.Stub() {
+@@ -716,7 +712,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
+ 
+     private void handleFingerprintHelp(int msgId, String helpString) {
+         Assert.isMainThread();
+-        if (mIsDeviceInPocket && mHasFod){
++        if (mIsDeviceInPocket){
+             return;
+         }
+         for (int i = 0; i < mCallbacks.size(); i++) {
+@@ -1754,8 +1750,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
+             }
+         };
+ 
+-        mHasFod = FodUtils.hasFodSupport(mContext);
+-
+         // Since device can't be un-provisioned, we only need to register a content observer
+         // to update mDeviceProvisioned when we are...
+         if (!mDeviceProvisioned) {
+@@ -1926,8 +1920,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
+             return;
+         }
+         mHandler.removeCallbacks(mRetryFingerprintAuthentication);
+-        boolean hideFodForStrongAuth = mHasFod && userNeedsStrongAuth();
+-        boolean shouldListenForFingerprint = !hideFodForStrongAuth && shouldListenForFingerprint();
++        boolean shouldListenForFingerprint = shouldListenForFingerprint();
+         boolean runningOrRestarting = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING
+                 || mFingerprintRunningState == BIOMETRIC_STATE_CANCELLING_RESTARTING;
+         if (runningOrRestarting && !shouldListenForFingerprint) {
+@@ -2020,14 +2013,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
+                 (mKeyguardOccluded && mIsDreaming)) && mDeviceInteractive && !mGoingToSleep
+                 && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())
+                 && (!mKeyguardGoingAway || !mDeviceInteractive) && mIsPrimaryUser
+-                && allowedOnBouncer && (mHasFod || !mIsDeviceInPocket);
++                && allowedOnBouncer && !mIsDeviceInPocket;
+         } else {
+            return (mKeyguardIsVisible || !mDeviceInteractive ||
+                 (mBouncer && !mKeyguardGoingAway) || mGoingToSleep ||
+                 shouldListenForFingerprintAssistant() || (mKeyguardOccluded && mIsDreaming))
+                 && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())
+                 && (!mKeyguardGoingAway || !mDeviceInteractive) && mIsPrimaryUser
+-                && allowedOnBouncer && (mHasFod || !mIsDeviceInPocket);
++                && allowedOnBouncer && !mIsDeviceInPocket;
+         }
+     }
+ 
 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
 deleted file mode 100644
 index 654d5c45460..00000000000
@@ -1950,6 +2020,69 @@ index 2412209452b..13b9508a9c8 100644
      @Override
      public void setBlockedGesturalNavigation(boolean blocked) {
          if (mBar != null) {
+diff --git a/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBar.java
+index 6095928c4cf..b7b9431d69d 100644
+--- a/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBar.java
++++ b/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBar.java
+@@ -26,7 +26,6 @@ import com.android.keyguard.KeyguardUpdateMonitor;
+ import com.android.keyguard.ViewMediatorCallback;
+ import com.android.systemui.InitController;
+ import com.android.systemui.assist.AssistManager;
+-import com.android.systemui.biometrics.FODCircleViewImpl;
+ import com.android.systemui.broadcast.BroadcastDispatcher;
+ import com.android.systemui.bubbles.BubbleController;
+ import com.android.systemui.colorextraction.SysuiColorExtractor;
+@@ -185,8 +184,7 @@ public class UnusedStatusBar extends StatusBar {
+             DismissCallbackRegistry dismissCallbackRegistry,
+             Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy,
+             StatusBarTouchableRegionManager statusBarTouchableRegionManager,
+-            TunerService tunerService,
+-            FODCircleViewImpl fodCircleViewImpl) {
++            TunerService tunerService) {
+         super(context, notificationsController, lightBarController, autoHideController,
+                 keyguardUpdateMonitor, statusBarIconController, pulseExpansionHandler,
+                 notificationWakeUpCoordinator, keyguardBypassController, keyguardStateController,
+@@ -213,8 +211,7 @@ public class UnusedStatusBar extends StatusBar {
+                 userInfoControllerImpl, phoneStatusBarPolicy, keyguardIndicationController,
+                 dismissCallbackRegistry, notificationShadeDepthControllerLazy,
+                 statusBarTouchableRegionManager,
+-                tunerService,
+-                fodCircleViewImpl);
++                tunerService);
+     }
+ 
+     @Override
+diff --git a/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBarModule.java b/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBarModule.java
+index 28bcaf6c144..f2cef14b558 100644
+--- a/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBarModule.java
++++ b/packages/CarSystemUI/src/com/android/systemui/car/statusbar/UnusedStatusBarModule.java
+@@ -30,7 +30,6 @@ import com.android.keyguard.KeyguardUpdateMonitor;
+ import com.android.keyguard.ViewMediatorCallback;
+ import com.android.systemui.InitController;
+ import com.android.systemui.assist.AssistManager;
+-import com.android.systemui.biometrics.FODCircleViewImpl;
+ import com.android.systemui.broadcast.BroadcastDispatcher;
+ import com.android.systemui.bubbles.BubbleController;
+ import com.android.systemui.colorextraction.SysuiColorExtractor;
+@@ -205,8 +204,7 @@ public interface UnusedStatusBarModule {
+             Lazy<NotificationShadeDepthController> notificationShadeDepthController,
+             DismissCallbackRegistry dismissCallbackRegistry,
+             StatusBarTouchableRegionManager statusBarTouchableRegionManager,
+-            TunerService tunerService,
+-            FODCircleViewImpl fodCircleViewImpl) {
++            TunerService tunerService) {
+         return new UnusedStatusBar(
+                 context,
+                 notificationsController,
+@@ -285,7 +283,6 @@ public interface UnusedStatusBarModule {
+                 dismissCallbackRegistry,
+                 notificationShadeDepthController,
+                 statusBarTouchableRegionManager,
+-                tunerService,
+-                fodCircleViewImpl);
++                tunerService);
+     }
+ }
 -- 
 2.25.1