summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2012-11-08 09:40:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-08 09:40:21 -0800
commit7d59cf9f10c38a020c7104e3bd5b358ab2144ab5 (patch)
tree9c7f18da4e9c7f57d7d87b8eb49fe43e6723a9bf
parent4eada64770bc2f021cb04cbb77efbad1c9a7adc4 (diff)
parente1a8eee6d0f006cc0c2eac2456808af539cb3975 (diff)
downloadbase-7d59cf9f10c38a020c7104e3bd5b358ab2144ab5.tar.gz
Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
-rw-r--r--core/res/res/layout/keyguard_pattern_view.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/core/res/res/layout/keyguard_pattern_view.xml b/core/res/res/layout/keyguard_pattern_view.xml
index 8d0d3f9d6527..1bd3e4ebdd9e 100644
--- a/core/res/res/layout/keyguard_pattern_view.xml
+++ b/core/res/res/layout/keyguard_pattern_view.xml
@@ -35,16 +35,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <include layout="@layout/keyguard_message_area"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:layout_gravity="center">
+ <include layout="@layout/keyguard_message_area"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+
<FrameLayout
android:id="@+id/keyguard_bouncer_frame"
android:background="@*android:drawable/kg_bouncer_bg_white"