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

Merge "Ensure that the keyguard container is always below message area." into sc-v2-dev

Browse Source
This commit is contained in:
Jamie Garside
2021-08-16 09:30:05 +00:00
committed by Android (Google) Code Review
parent 103c305438 6037800f12
commit 8a265b2187
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
View File

@@ -20,8 +20,8 @@
<com.android.keyguard.KeyguardPINView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/keyguard_pin_view"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/keyguard_pin_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
androidprv:layout_maxWidth="@dimen/keyguard_security_width"
@@ -52,7 +52,7 @@
androidprv:layout_constraintTop_toTopOf="parent"
androidprv:layout_constraintBottom_toTopOf="@id/key1"
androidprv:layout_constraintVertical_bias="1.0">
androidprv:layout_constraintVertical_bias="0.0">
<com.android.keyguard.PasswordTextView
android:id="@+id/pinEntry"

13
packages/SystemUI/res/layout/super_notification_shade.xml
View File

@@ -81,9 +81,10 @@
/>
<!-- Keyguard messages -->
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginTop="@dimen/status_bar_height"
android:layout_gravity="top|center_horizontal"
android:gravity="center_horizontal">
@@ -97,7 +98,11 @@
android:singleLine="true"
android:ellipsize="marquee"
android:focusable="true" />
</FrameLayout>
<FrameLayout android:id="@+id/keyboard_bouncer_container"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_weight="1" />
</LinearLayout>
<com.android.systemui.biometrics.AuthRippleView
android:id="@+id/auth_ripple"

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -1767,7 +1767,7 @@ public class StatusBar extends SystemUI implements
}
protected ViewGroup getBouncerContainer() {
return mNotificationShadeWindowView;
return mNotificationShadeWindowView.findViewById(R.id.keyboard_bouncer_container);
}
public int getStatusBarHeight() {