summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Wren <cwren@android.com> 2012-11-08 15:58:44 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-08 15:58:44 -0800
commitb063e7b6345bea6ceed7e30a79cc4deff6b07ce6 (patch)
treef921096f01c584e9170be4740c4de31ff16fc872
parent11bf8e2c14877cbd693b8d9764502db06fea6ea7 (diff)
parentb3e8071d8198096fe1bb19183c5ba3d342a11fe9 (diff)
am b3e8071d: am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
* commit 'b3e8071d8198096fe1bb19183c5ba3d342a11fe9': allow pattern linear layout to manage message_area.
-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"