diff options
author | James Kung <kingkung@google.com> | 2013-04-17 20:27:25 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 20:27:25 -0700 |
commit | 92ba53425cde8a2d5571939e4b470bc09b818a0e (patch) | |
tree | 9dabd0c7b3910733f7e0a23a73e2e12894f305be | |
parent | 916267bde916edd7cc1a8b15d4048b0b4b2ccf30 (diff) | |
parent | 0f9d5a35b4190078ff0b9040f73799fa27840899 (diff) | |
download | android_frameworks_opt_datetimepicker-92ba53425cde8a2d5571939e4b470bc09b818a0e.tar.gz android_frameworks_opt_datetimepicker-92ba53425cde8a2d5571939e4b470bc09b818a0e.tar.bz2 android_frameworks_opt_datetimepicker-92ba53425cde8a2d5571939e4b470bc09b818a0e.zip |
am 0f9d5a35: Date/Time Picker done button minheight 48dp Date Picker minor UI tweaks
* commit '0f9d5a35b4190078ff0b9040f73799fa27840899':
Date/Time Picker done button minheight 48dp Date Picker minor UI tweaks
-rw-r--r-- | res/layout-land/time_picker_dialog.xml | 1 | ||||
-rw-r--r-- | res/layout/date_picker_done_button.xml | 4 | ||||
-rw-r--r-- | res/layout/time_picker_dialog.xml | 1 | ||||
-rw-r--r-- | res/values-sw600dp-land/dimens.xml | 1 | ||||
-rw-r--r-- | res/values-w270dp-h560dp/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | src/com/android/datetimepicker/date/SimpleMonthView.java | 2 |
7 files changed, 8 insertions, 5 deletions
diff --git a/res/layout-land/time_picker_dialog.xml b/res/layout-land/time_picker_dialog.xml index 0d21f20..b24daf3 100644 --- a/res/layout-land/time_picker_dialog.xml +++ b/res/layout-land/time_picker_dialog.xml @@ -54,6 +54,7 @@ style="?android:attr/buttonBarButtonStyle" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minHeight="48dp" android:text="@string/done_label" android:textSize="@dimen/done_label_size" android:textColor="@color/done_text_color" /> diff --git a/res/layout/date_picker_done_button.xml b/res/layout/date_picker_done_button.xml index 9292d42..ebe24d3 100644 --- a/res/layout/date_picker_done_button.xml +++ b/res/layout/date_picker_done_button.xml @@ -24,6 +24,8 @@ style="?android:attr/buttonBarButtonStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/done_label" + android:minHeight="48dp" + android:text="@string/done_label" + android:textSize="@dimen/done_label_size" android:textColor="@color/done_text_color" /> </LinearLayout> diff --git a/res/layout/time_picker_dialog.xml b/res/layout/time_picker_dialog.xml index 07867d1..b4d2d1c 100644 --- a/res/layout/time_picker_dialog.xml +++ b/res/layout/time_picker_dialog.xml @@ -51,6 +51,7 @@ android:id="@+id/done_button" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minHeight="48dp" android:text="@string/done_label" android:textSize="@dimen/done_label_size" android:textColor="@color/done_text_color" diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 608d2f9..c19dd8c 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -24,7 +24,6 @@ <dimen name="time_label_right_padding">16sp</dimen> <dimen name="time_label_size">64sp</dimen> <dimen name="ampm_label_size">21sp</dimen> - <dimen name="done_label_size">14sp</dimen> <dimen name="ampm_left_padding">7dip</dimen> <dimen name="separator_padding">5dip</dimen> <dimen name="header_height">96dip</dimen> diff --git a/res/values-w270dp-h560dp/dimens.xml b/res/values-w270dp-h560dp/dimens.xml index a981940..66fa85f 100644 --- a/res/values-w270dp-h560dp/dimens.xml +++ b/res/values-w270dp-h560dp/dimens.xml @@ -21,7 +21,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:android="http://schemas.android.com/apk/res/android" > - <dimen name="selected_calendar_layout_height">240dp</dimen> + <dimen name="selected_calendar_layout_height">230dp</dimen> <dimen name="selected_date_year_size">30dp</dimen> <dimen name="selected_date_day_size">100dp</dimen> <dimen name="selected_date_month_size">30dp</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 6852e1e..2b093cb 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -32,7 +32,7 @@ <dimen name="time_label_size">60sp</dimen> <dimen name="extra_time_label_margin">-30dp</dimen> <dimen name="ampm_label_size">16sp</dimen> - <dimen name="done_label_size">16sp</dimen> + <dimen name="done_label_size">14sp</dimen> <dimen name="ampm_left_padding">6dip</dimen> <dimen name="separator_padding">4dip</dimen> <dimen name="header_height">96dip</dimen> diff --git a/src/com/android/datetimepicker/date/SimpleMonthView.java b/src/com/android/datetimepicker/date/SimpleMonthView.java index f2a90d7..c3a4346 100644 --- a/src/com/android/datetimepicker/date/SimpleMonthView.java +++ b/src/com/android/datetimepicker/date/SimpleMonthView.java @@ -334,7 +334,7 @@ public class SimpleMonthView extends View { private void drawMonthTitle(Canvas canvas) { int x = (mWidth + 2 * mPadding) / 2; - int y = (MONTH_HEADER_SIZE - MONTH_DAY_LABEL_TEXT_SIZE) / 2; + int y = (MONTH_HEADER_SIZE - MONTH_DAY_LABEL_TEXT_SIZE) / 2 + (MONTH_LABEL_TEXT_SIZE / 3); StringBuffer sbuf = new StringBuffer(); sbuf.append(mCalendar.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault())); |