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

Merge "Process insets correctly" into qt-dev

Browse Source 
am: 2534d6ecee

Change-Id: I2874a8dbebf5b3f946ebd9fb191221ef47eee619
This commit is contained in:
Lucas Dupin
2019-05-13 22:20:40 -07:00
committed by android-build-merger
parent 6987b3d9de 2534d6ecee
commit 70388a0874
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
View File

@@ -38,6 +38,7 @@
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:padding="0dp" android:padding="0dp"
android:fitsSystemWindows="true"
android:layout_gravity="center"> android:layout_gravity="center">
<com.android.keyguard.KeyguardSecurityViewFlipper <com.android.keyguard.KeyguardSecurityViewFlipper
android:id="@+id/view_flipper" android:id="@+id/view_flipper"

18
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -20,6 +20,7 @@ import android.app.AlertDialog;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.Rect;
import android.metrics.LogMaker; import android.metrics.LogMaker;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.AttributeSet; import android.util.AttributeSet;
@@ -139,7 +140,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
getSecurityView(mCurrentSecuritySelection).onResume(reason); getSecurityView(mCurrentSecuritySelection).onResume(reason);
} }
updateBiometricRetry(); updateBiometricRetry();
updatePaddings();
} }
@Override @Override
@@ -319,17 +319,11 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
} }
@Override @Override
protected void onAttachedToWindow() { protected boolean fitSystemWindows(Rect insets) {
super.onAttachedToWindow(); // Consume bottom insets because we're setting the padding locally (for IME and navbar.)
updatePaddings(); setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), insets.bottom);
} insets.bottom = 0;
return false;
private void updatePaddings() {
int bottomPadding = getRootWindowInsets().getSystemWindowInsets().bottom;
if (getPaddingBottom() == bottomPadding) {
return;
}
setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), bottomPadding);
} }
private void showDialog(String title, String message) { private void showDialog(String title, String message) {