Skip to content

Commit afca98c

Browse files
Dil3mm4Genkzsz11
authored andcommitted
SystemUI: Don't shift KeyguardSecurityContainer when FOD isn't available
Tests: -removed enrolled fp, ensured keyguardsecuritycontainer wasn't shifed -removed enrolled fp, rebooted, ensured keyguardsecuritycontainer (on SIM PIN) wasn't shifted Change-Id: Iccf469fa4fed79ff0edde014ba165eef6ee024e1
1 parent 60cfd0d commit afca98c

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import android.app.admin.DevicePolicyManager;
3434
import android.content.Context;
3535
import android.content.Intent;
36+
import android.content.pm.PackageManager;
3637
import android.content.res.ColorStateList;
3738
import android.graphics.Insets;
3839
import android.graphics.Rect;
@@ -79,6 +80,8 @@
7980
import com.android.systemui.statusbar.policy.KeyguardStateController;
8081
import com.android.systemui.util.InjectionInflationController;
8182

83+
import com.android.internal.util.nad.fod.FodUtils;
84+
8285
import java.util.List;
8386

8487
public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSecurityView {
@@ -124,6 +127,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
124127
private InjectionInflationController mInjectionInflationController;
125128
private boolean mSwipeUpToRetry;
126129
private AdminSecondaryLockScreenController mSecondaryLockScreenController;
130+
private boolean mHasFod;
127131

128132
private final ViewConfiguration mViewConfiguration;
129133
private final SpringAnimation mSpringAnimation;
@@ -261,6 +265,9 @@ public KeyguardSecurityContainer(Context context, AttributeSet attrs, int defSty
261265
mKeyguardStateController = Dependency.get(KeyguardStateController.class);
262266
mSecondaryLockScreenController = new AdminSecondaryLockScreenController(context, this,
263267
mUpdateMonitor, mCallback, new Handler(Looper.myLooper()));
268+
269+
PackageManager packageManager = mContext.getPackageManager();
270+
mHasFod = FodUtils.hasFodSupport(context);
264271
}
265272

266273
public void setSecurityCallback(SecurityCallback callback) {
@@ -517,8 +524,9 @@ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
517524

518525
// Consume bottom insets because we're setting the padding locally (for IME and navbar.)
519526
int inset;
520-
int minBottomMargin = getResources().getDimensionPixelSize(
521-
R.dimen.kg_security_container_min_bottom_margin);
527+
int minBottomMargin = mHasFod && mUpdateMonitor.isFingerprintDetectionRunning() ?
528+
getResources().getDimensionPixelSize(
529+
R.dimen.kg_security_container_min_bottom_margin) : 0;
522530

523531
if (sNewInsetsMode == NEW_INSETS_MODE_FULL) {
524532
int bottomInset = insets.getInsetsIgnoringVisibility(systemBars()).bottom;

0 commit comments

Comments
 (0)