FOD: Show fod circle below pattern/pin view

Change-Id: Ie9652afc0d105199bf1e660221c82266ac8cf30a
Signed-off-by: rituj <ritujbeniwal@gmail.com>
Signed-off-by: Joey Huab <joey@evolution-x.org>

Author: ritujb

packages/SystemUI/res-keyguard/values-sw540dp-port/dimens.xml

@@ -20,5 +20,5 @@
 <resources>
     <!-- Height of the sliding KeyguardSecurityContainer
         (includes 2x keyguard_security_view_top_margin) -->
-    <dimen name="keyguard_security_height">550dp</dimen>
+    <dimen name="keyguard_security_height">690dp</dimen>
 </resources>

packages/SystemUI/res-keyguard/values-sw720dp/dimens.xml

@@ -20,7 +20,7 @@
 
     <!-- Height of the sliding KeyguardSecurityContainer
          (includes 2x keyguard_security_view_top_margin) -->
-    <dimen name="keyguard_security_height">470dp</dimen>
+    <dimen name="keyguard_security_height">610dp</dimen>
 
     <dimen name="widget_big_font_size">100dp</dimen>
 </resources>

packages/SystemUI/res-keyguard/values/dimens.xml

@@ -27,11 +27,15 @@
 
     <!-- Height of the sliding KeyguardSecurityContainer
          (includes 2x keyguard_security_view_top_margin) -->
-    <dimen name="keyguard_security_height">420dp</dimen>
+    <dimen name="keyguard_security_height">560dp</dimen>
 
     <!-- Max Height of the sliding KeyguardSecurityContainer
          (includes 2x keyguard_security_view_top_margin) -->
-    <dimen name="keyguard_security_max_height">450dp</dimen>
+    <dimen name="keyguard_security_max_height">590dp</dimen>
+
+    <!-- The margin between Emergency Carrier area and pattern/pin
+         view to incorporate the FOD icon -->
+    <dimen name="keyguard_security_fod_view_margin">140dp</dimen>
 
     <!-- Margin around the various security views -->
     <dimen name="keyguard_security_view_top_margin">8dp</dimen>

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

@@ -32,6 +32,7 @@
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewConfiguration;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
@@ -54,6 +55,7 @@
 public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSecurityView {
     private static final boolean DEBUG = KeyguardConstants.DEBUG;
     private static final String TAG = "KeyguardSecurityView";
+    private static final String FOD = "vendor.lineage.biometrics.fingerprint.inscreen";
 
     private static final int USER_TYPE_PRIMARY = 1;
     private static final int USER_TYPE_WORK_PROFILE = 2;
@@ -100,6 +102,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
     private int mActivePointerId = -1;
     private boolean mIsDragging;
     private float mStartTouchY = -1;
+    private final int mFODmargin;
 
     // Used to notify the container when something interesting happens.
     public interface SecurityCallback {
@@ -135,6 +138,8 @@ public KeyguardSecurityContainer(Context context, AttributeSet attrs, int defSty
             SystemUIFactory.getInstance().getRootComponent());
         mUnlockMethodCache = UnlockMethodCache.getInstance(context);
         mViewConfiguration = ViewConfiguration.get(context);
+        mFODmargin = mContext.getResources().getDimensionPixelSize(
+            R.dimen.keyguard_security_fod_view_margin);
     }
 
     public void setSecurityCallback(SecurityCallback callback) {
@@ -297,6 +302,15 @@ private KeyguardSecurityView getSecurityView(SecurityMode securityMode) {
             if (DEBUG) Log.v(TAG, "inflating id = " + layoutId);
             View v = mInjectionInflationController.injectable(inflater)
                     .inflate(layoutId, mSecurityViewFlipper, false);
+            View eca = v.findViewById(R.id.keyguard_selector_fade_container);
+            if (eca != null && hasInDisplayFingerprint() &&
+                    (securityMode == SecurityMode.Pattern
+                        || securityMode == SecurityMode.PIN)) {
+                ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams)
+                            eca.getLayoutParams();
+                lp.setMargins(lp.leftMargin, mFODmargin, lp.rightMargin,
+                            lp.bottomMargin);
+            }
             mSecurityViewFlipper.addView(v);
             updateSecurityView(v);
             view = (KeyguardSecurityView)v;
@@ -463,6 +477,10 @@ private void reportFailedUnlockAttempt(int userId, int timeoutMs) {
         }
     }
 
+    private boolean hasInDisplayFingerprint() {
+        return mContext.getPackageManager().hasSystemFeature(FOD);
+    }
+
     /**
      * Shows the primary security screen for the user. This will be either the multi-selector
      * or the user's security method.
@@ -579,6 +597,7 @@ private void showSecurityScreen(SecurityMode securityMode) {
         mCurrentSecurityView = newView;
         mSecurityCallback.onSecurityModeChanged(securityMode,
                 securityMode != SecurityMode.None && newView.needsInput());
+        mUpdateMonitor.setSecurityMode(securityMode);
     }
 
     private KeyguardSecurityViewFlipper getFlipper() {

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

@@ -98,6 +98,7 @@
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.util.Preconditions;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
 import com.android.settingslib.WirelessUtils;
 import com.android.systemui.R;
 import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -259,6 +260,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     private int mFingerprintRunningState = BIOMETRIC_STATE_STOPPED;
     private int mFaceRunningState = BIOMETRIC_STATE_STOPPED;
     private LockPatternUtils mLockPatternUtils;
+    private SecurityMode mCurrentSecurityMode = SecurityMode.Invalid;
     private final IDreamManager mDreamManager;
     private boolean mIsDreaming;
     private final DevicePolicyManager mDevicePolicyManager;
@@ -930,6 +932,14 @@ private void handleFaceUnlockStateChanged(boolean running, int userId) {
         }
     }
 
+    public SecurityMode getSecurityMode() {
+        return mCurrentSecurityMode;
+    }
+
+    public void setSecurityMode(SecurityMode securityMode) {
+        mCurrentSecurityMode = securityMode;
+    }
+
     public boolean isFaceUnlockRunning(int userId) {
         return mUserFaceUnlockRunning.get(userId);
     }

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

@@ -39,6 +39,7 @@
 import android.view.WindowManager;
 import android.widget.ImageView;
 
+import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
 import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.KeyguardUpdateMonitorCallback;
 import com.android.systemui.R;
@@ -130,10 +131,17 @@ public void onKeyguardVisibilityChanged(boolean showing) {
         public void onKeyguardBouncerChanged(boolean isBouncer) {
             mIsBouncer = isBouncer;
 
-            if (isBouncer) {
+            if (mUpdateMonitor.isFingerprintDetectionRunning()) {
+                final SecurityMode sec = mUpdateMonitor.getSecurityMode();
+                final boolean maybeShow = sec == SecurityMode.Pattern ||
+                        sec == SecurityMode.PIN;
+                if (maybeShow || !mIsBouncer) {
+                    show();
+                } else {
+                    hide();
+                }
+            } else {
                 hide();
-            } else if (mUpdateMonitor.isFingerprintDetectionRunning()) {
-                show();
             }
         }