am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev

* commit '8dd3aaddba551eab19cf7ced07ab066575377c5e':
  Align carrier info for glowpad keyguard screen
This commit is contained in:
Adam Powell
2012-10-12 15:14:29 -07:00
committed by Android Git Automerger
2 changed files with 3 additions and 5 deletions

View File

@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:layout_alignParentBottom="true">

View File

@@ -41,10 +41,8 @@
<include layout="@layout/keyguard_emergency_carrier_area"
android:id="@+id/keyguard_selector_fade_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="bottom|center_horizontal"
android:gravity="center_horizontal" />
android:layout_height="48dp"
android:layout_gravity="bottom|center_horizontal" />
</FrameLayout>
</com.android.internal.policy.impl.keyguard.KeyguardSelectorView>