Merge "Don't clip keyguard security container children (e.g. glow pad)" into klp-dev (ba551061) · Commits · e / os / android_frameworks_base

packages/Keyguard/res/layout-land/keyguard_host_view.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@
		android:id="@+id/keyguard_security_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:clipChildren="false"
		android:clipToPadding="false"
		androidprv:layout_childType="challenge"
		androidprv:layout_centerWithinArea="0.55">
		<com.android.keyguard.KeyguardSecurityViewFlipper

+4 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,8 @@
		<com.android.keyguard.SlidingChallengeLayout
		android:id="@+id/sliding_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		android:layout_height="match_parent"
		android:clipChildren="false">

		<FrameLayout
		android:layout_width="match_parent"
		@@ -64,6 +65,8 @@
		android:id="@+id/keyguard_security_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:clipChildren="false"
		android:clipToPadding="false"
		androidprv:layout_maxHeight="@dimen/keyguard_security_height"
		androidprv:layout_childType="challenge"
		android:padding="0dp"

+2 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,8 @@
		android:id="@+id/keyguard_security_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:clipChildren="false"
		android:clipToPadding="false"
		androidprv:layout_centerWithinArea="0.5"
		androidprv:layout_childType="challenge"
		android:layout_gravity="center_horizontal\|bottom">