diff options
| author | 2011-11-01 12:45:11 -0700 | |
|---|---|---|
| committer | 2011-11-01 12:45:11 -0700 | |
| commit | a67217c35ec43e06598b71feae63ce675fa9cac7 (patch) | |
| tree | 4577d972ea8f9d8788745c032b938363c5a1d74d | |
| parent | deb15704e9abcfc71bb81a358ff3bb239896474d (diff) | |
| parent | 5750b1ffb7ce853b7b53c9522cd8666e2a4c6575 (diff) | |
Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
| -rw-r--r-- | core/res/res/layout/keyguard_screen_unlock_portrait.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index f286ccdb0f45..336faa19b182 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -29,7 +29,7 @@ <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_marginTop="@dimen/keyguard_lockscreen_status_line_clockfont_top_margin" - android:layout_marginBottom="12dip" + android:layout_marginBottom="@dimen/keyguard_lockscreen_status_line_clockfont_bottom_margin" android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin" android:layout_gravity="right"> @@ -42,7 +42,6 @@ android:ellipsize="none" android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_background" /> @@ -53,7 +52,6 @@ android:ellipsize="none" android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_foreground" /> @@ -110,11 +108,10 @@ android:id="@+id/lockPattern" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="8dip" android:layout_marginRight="8dip" android:layout_marginBottom="4dip" android:layout_marginLeft="8dip" - android:layout_gravity="center|bottom" + android:layout_gravity="center_horizontal" /> <TextView diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 607054ab0507..3edd5ce823b2 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -152,16 +152,19 @@ <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen> <!-- Size of clock font in LockScreen on Unsecure unlock screen. --> - <dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen> + <dimen name="keyguard_lockscreen_clock_font_size">80dip</dimen> <!-- Size of status line font on Unsecure unlock LockScreen. --> - <dimen name="keyguard_lockscreen_status_line_font_size">14sp</dimen> + <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen> <!-- Size of right margin on Unsecure unlock LockScreen --> <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen> <!-- Size of top margin on Clock font to edge on unlock LockScreen --> - <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">24dip</dimen> + <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen> + + <!-- Size of top margin on Clock font to edge on unlock LockScreen --> + <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen> <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. --> <dimen name="activity_chooser_popup_min_width">200dip</dimen> |