Merge "Ensure that the keyguard container is always below message area." into... (5071c956) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -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"

+9 −4

Original line number	Diff line number	Diff line
		@@ -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"

+1 −1

Original line number	Diff line number	Diff line
		@@ -1768,7 +1768,7 @@ public class StatusBar extends SystemUI implements
		}

		protected ViewGroup getBouncerContainer() {
		return mNotificationShadeWindowView;
		return mNotificationShadeWindowView.findViewById(R.id.keyboard_bouncer_container);
		}

		public int getStatusBarHeight() {