Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev

Author: adamp

core/res/res/layout/keyguard_emergency_carrier_area.xml

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

core/res/res/layout/keyguard_selector_view.xml

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