diff options
| author | Adam Powell <adamp@google.com> | 2012-10-12 15:11:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-12 15:11:51 -0700 |
| commit | 8dd3aaddba551eab19cf7ced07ab066575377c5e (patch) | |
| tree | 7e80ffe61174905e0d925a03dc458ffb7f639fc9 | |
| parent | 95cccb9d6175cb80d9312fadbe40cf7c4ec9f949 (diff) | |
| parent | ba48a39e174102274c395147dfd1d27959dcc919 (diff) | |
| download | frameworks_base-8dd3aaddba551eab19cf7ced07ab066575377c5e.zip frameworks_base-8dd3aaddba551eab19cf7ced07ab066575377c5e.tar.gz frameworks_base-8dd3aaddba551eab19cf7ced07ab066575377c5e.tar.bz2 | |
Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev
| -rw-r--r-- | core/res/res/layout/keyguard_emergency_carrier_area.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_selector_view.xml | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/res/res/layout/keyguard_emergency_carrier_area.xml b/core/res/res/layout/keyguard_emergency_carrier_area.xml index c16955c..f9a593f 100644 --- a/core/res/res/layout/keyguard_emergency_carrier_area.xml +++ b/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"> diff --git a/core/res/res/layout/keyguard_selector_view.xml b/core/res/res/layout/keyguard_selector_view.xml index 4838c2a..daaf35b 100644 --- a/core/res/res/layout/keyguard_selector_view.xml +++ b/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> |