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

Merge "Don't clip keyguard security container children (e.g. glow pad)" into klp-dev

Browse Source
This commit is contained in:
Alan Viverette
2013-10-21 20:48:57 +00:00
committed by Android (Google) Code Review
parent 089959a063 99f2f5e704
commit ba55106148
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Keyguard/res/layout-land/keyguard_host_view.xml
View File

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

5
packages/Keyguard/res/layout-port/keyguard_host_view.xml
View File

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

2
packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml
View File

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