diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:37:05 -0800 |
| commit | 1f5a43d0469fce561c311a19c85ac8dd036c4cac (patch) | |
| tree | 3b3ce44c9eccb23e898ee53c45c3e9bac1962fb7 /res/values-sw600dp/dimens.xml | |
| parent | 057d88c735d8d0e7dce9714f9db28388501c24e7 (diff) | |
| parent | 0ed03e8e14cf2edcda9ee3ecc604d4e048c8ccf3 (diff) | |
| download | android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.tar.gz android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.tar.bz2 android_packages_apps_DeskClock-1f5a43d0469fce561c311a19c85ac8dd036c4cac.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/DeskClock into 1.1mr1.1-staging
Android 4.2.2 release 1
Conflicts:
res/xml/settings.xml
src/com/android/deskclock/AlarmAlertFullScreen.java
src/com/android/deskclock/AlarmKlaxon.java
src/com/android/deskclock/DeskClock.java
src/com/android/deskclock/SettingsActivity.java
Change-Id: Ieba9c47923469713cf14c310044fe8fb3b31523c
Diffstat (limited to 'res/values-sw600dp/dimens.xml')
| -rw-r--r-- | res/values-sw600dp/dimens.xml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 9ff029259..d14e6c632 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -27,7 +27,9 @@ <dimen name="time_margin_right">8dip</dimen> <dimen name="time_margin_left">8dip</dimen> <dimen name="time_margin_bottom">14dip</dimen> - <dimen name="time_margin_top">32dip</dimen> + <dimen name="time_margin_top">48dip</dimen> + <dimen name="digital_margin_bottom">36dip</dimen> + <dimen name="screensaver_margin">32dip</dimen> <dimen name="ampm_margin_top">15dip</dimen> <dimen name="font_margin_adjust">8dip</dimen> <dimen name="next_alarm_margin_top">-5dip</dimen> @@ -56,14 +58,15 @@ <!-- Size of margin for circles. --> <dimen name="circle_margin_top">48dp</dimen> <dimen name="circle_margin">96dp</dimen> - <dimen name="laps_margin">110dp</dimen> <dimen name="analog_clock_margin">96dp</dimen> + <dimen name="timer_circle_margin">96dp</dimen> <!-- Width of the clock, for use with alarm buttons. --> <dimen name="alarm_alert_display_width">550dip</dimen> <!-- Size of analog clock in world clock. --> <dimen name="world_clock_analog_size">200dip</dimen> + <dimen name="world_clock_margin">96dp</dimen> <!-- Empty space at the edges of the +1 and reset button icons. Based off of 56dip width.--> <dimen name="plusone_reset_button_padding">23dip</dimen> <!-- Empty space at the edges of the delete button icons. Based off of 56dip width. --> @@ -81,11 +84,11 @@ <dimen name="glowpadview_margin_bottom">0dip</dimen> - <dimen name="min_digital_widget_width">300dip</dimen> + <dimen name="min_digital_widget_width">450dip</dimen> <dimen name="min_digital_widget_height">120dip</dimen> - <dimen name="min_digital_widget_resize_width">200dip</dimen> + <dimen name="min_digital_widget_resize_width">450dip</dimen> <dimen name="min_digital_widget_resize_height">120dip</dimen> <dimen name="def_digital_widget_width">200dip</dimen> - <dimen name="def_digital_widget_height">190dip</dimen> + <dimen name="digital_widget_list_min_height">190dip</dimen> </resources> |