diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-21 13:55:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-21 13:55:51 -0700 |
| commit | 5c675074c774c4e260f738b52eca47fe9f3e6ffa (patch) | |
| tree | dacd47a3504a3dc8a3aad28595ca84c8e201294c /packages/Keyguard | |
| parent | 7a670250c9541e41fd450a70f539cafec2d6028b (diff) | |
| parent | c5aa0ab2e8c47f0d16077abec1531998fbc5b415 (diff) | |
| download | frameworks_base-5c675074c774c4e260f738b52eca47fe9f3e6ffa.zip frameworks_base-5c675074c774c4e260f738b52eca47fe9f3e6ffa.tar.gz frameworks_base-5c675074c774c4e260f738b52eca47fe9f3e6ffa.tar.bz2 | |
am c5aa0ab2: am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev
* commit 'c5aa0ab2e8c47f0d16077abec1531998fbc5b415':
Don't clip keyguard security container children (e.g. glow pad)
Diffstat (limited to 'packages/Keyguard')
3 files changed, 8 insertions, 1 deletions
diff --git a/packages/Keyguard/res/layout-land/keyguard_host_view.xml b/packages/Keyguard/res/layout-land/keyguard_host_view.xml index eeb9ee7..9f1c1f0 100644 --- a/packages/Keyguard/res/layout-land/keyguard_host_view.xml +++ b/packages/Keyguard/res/layout-land/keyguard_host_view.xml @@ -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 diff --git a/packages/Keyguard/res/layout-port/keyguard_host_view.xml b/packages/Keyguard/res/layout-port/keyguard_host_view.xml index 8498dcf..136b296 100644 --- a/packages/Keyguard/res/layout-port/keyguard_host_view.xml +++ b/packages/Keyguard/res/layout-port/keyguard_host_view.xml @@ -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" diff --git a/packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml b/packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml index 77bc9b5..85f6b6d 100644 --- a/packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml +++ b/packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml @@ -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"> |