am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev

* commit 'f080dc0c7d8d502046cb5274999279b3447e9585':
  allow pattern linear layout to manage message_area.
This commit is contained in:
Chris Wren
2012-11-08 13:13:52 -08:00
committed by Android Git Automerger

View File

@@ -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"