summaryrefslogtreecommitdiffstats
path: root/core/res/res/layout-port
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-11-06 21:32:42 -0800
committerAdam Powell <adamp@google.com>2012-11-06 23:00:30 -0800
commit9799714f6c69efe50e21a6073b879140e5e792b7 (patch)
treeae139e14a6611f0362f0214d06a506cd3cec7379 /core/res/res/layout-port
parent9edc48e26354f6a7282e68851a6d9ba734c7ceb1 (diff)
downloadframeworks_base-9799714f6c69efe50e21a6073b879140e5e792b7.tar.gz
frameworks_base-9799714f6c69efe50e21a6073b879140e5e792b7.tar.bz2
frameworks_base-9799714f6c69efe50e21a6073b879140e5e792b7.zip
Keyguard layout tweaking/reworking
Teach KeyguardSecurityViewFlipper about layout_maxWidth/Height. Give maxes to security views. Fix some IME layout weirdness in SlidingChallengeLayout by adding more weirdness. Change-Id: I8047d32302aad44844de06d54b150586b0861dab
Diffstat (limited to 'core/res/res/layout-port')
-rw-r--r--core/res/res/layout-port/keyguard_host_view.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/layout-port/keyguard_host_view.xml b/core/res/res/layout-port/keyguard_host_view.xml
index b2bf3f147e4..73f07d587a9 100644
--- a/core/res/res/layout-port/keyguard_host_view.xml
+++ b/core/res/res/layout-port/keyguard_host_view.xml
@@ -62,7 +62,8 @@
<com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer
android:id="@+id/keyguard_security_container"
android:layout_width="wrap_content"
- android:layout_height="@dimen/keyguard_security_height"
+ android:layout_height="wrap_content"
+ android:layout_maxHeight="@dimen/keyguard_security_height"
androidprv:layout_childType="challenge"
android:padding="0dp"
android:gravity="bottom|center_horizontal">