diff options
| -rw-r--r-- | res/values-xlarge/dimens.xml | 9 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | src/com/android/calendar/DayView.java | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index af38165e..7ee97618 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -19,14 +19,17 @@ <dimen name="all_day_bottom_margin">10dip</dimen> <dimen name="one_day_header_height">0dip</dimen> <dimen name="day_header_bottom_margin">6dip</dimen> - <dimen name="date_header_text_size">32sp</dimen> + <dimen name="date_header_text_size">24sp</dimen> <dimen name="hours_text_size">16sp</dimen> <dimen name="allday_text_size">14sp</dimen> <dimen name="ampm_text_size">12sp</dimen> + <dimen name="event_text_size">14sp</dimen> + <dimen name="event_text_vertical_margin">4dp</dimen> + <dimen name="event_min_height">28dip</dimen> <!-- minimum size of hours column in day/week view --> - <dimen name="min_hours_width">48dip</dimen> + <dimen name="min_hours_width">32dip</dimen> <!-- margins size of hours column in day/week view --> - <dimen name="hours_left_margin">44dip</dimen> + <dimen name="hours_left_margin">28dip</dimen> <dimen name="hours_right_margin">4dip</dimen> <!-- size of day header in day and week views --> <dimen name="day_header_height">45dip</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 9bfa3a07..c8959384 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,6 +22,9 @@ <dimen name="hours_text_size">12sp</dimen> <dimen name="allday_text_size">12sp</dimen> <dimen name="ampm_text_size">10sp</dimen> + <dimen name="event_text_size">12sp</dimen> + <dimen name="event_text_vertical_margin">2dp</dimen> + <dimen name="event_min_height">24dip</dimen> <!-- minimum size of hours column in day/week view --> <dimen name="min_hours_width">24dip</dimen> <!-- margins size of hours column in day/week view --> diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java index 2fd69b10..927d5c7a 100644 --- a/src/com/android/calendar/DayView.java +++ b/src/com/android/calendar/DayView.java @@ -553,6 +553,12 @@ public class DayView extends View implements View.OnCreateContextMenuListener, HOURS_LEFT_MARGIN = (int) mResources.getDimension(R.dimen.hours_left_margin); HOURS_RIGHT_MARGIN = (int) mResources.getDimension(R.dimen.hours_right_margin); MULTI_DAY_HEADER_HEIGHT = (int) mResources.getDimension(R.dimen.day_header_height); + EVENT_TEXT_FONT_SIZE = (int) mResources.getDimension(R.dimen.event_text_size); + MIN_EVENT_HEIGHT = mResources.getDimension(R.dimen.event_min_height); + EVENT_TEXT_TOP_MARGIN = (int) mResources.getDimension(R.dimen.event_text_vertical_margin); + EVENT_TEXT_BOTTOM_MARGIN = EVENT_TEXT_TOP_MARGIN; + EVENT_ALL_DAY_TEXT_TOP_MARGIN = EVENT_TEXT_TOP_MARGIN; + EVENT_ALL_DAY_TEXT_BOTTOM_MARGIN = EVENT_TEXT_TOP_MARGIN; if (mScale == 0) { @@ -563,11 +569,9 @@ public class DayView extends View implements View.OnCreateContextMenuListener, MAX_HEIGHT_OF_ONE_ALLDAY_EVENT *= mScale; NORMAL_FONT_SIZE *= mScale; - EVENT_TEXT_FONT_SIZE *= mScale; GRID_LINE_LEFT_MARGIN *= mScale; HOURS_TOP_MARGIN *= mScale; MIN_CELL_WIDTH_FOR_TEXT *= mScale; - MIN_EVENT_HEIGHT *= mScale; MIN_UNEXPANDED_ALLDAY_EVENT_HEIGHT *= mScale; MAX_UNEXPANDED_ALLDAY_HEIGHT *= mScale; mAnimateDayEventHeight = (int) MIN_UNEXPANDED_ALLDAY_EVENT_HEIGHT; @@ -587,12 +591,8 @@ public class DayView extends View implements View.OnCreateContextMenuListener, DAY_HEADER_ONE_DAY_RIGHT_MARGIN *= mScale; DAY_HEADER_ONE_DAY_BOTTOM_MARGIN *= mScale; CALENDAR_COLOR_SQUARE_SIZE *= mScale; - EVENT_TEXT_TOP_MARGIN *= mScale; - EVENT_TEXT_BOTTOM_MARGIN *= mScale; EVENT_TEXT_LEFT_MARGIN *= mScale; EVENT_TEXT_RIGHT_MARGIN *= mScale; - EVENT_ALL_DAY_TEXT_TOP_MARGIN *= mScale; - EVENT_ALL_DAY_TEXT_BOTTOM_MARGIN *= mScale; EVENT_ALL_DAY_TEXT_LEFT_MARGIN *= mScale; EVENT_ALL_DAY_TEXT_RIGHT_MARGIN *= mScale; EVENT_RECT_TOP_MARGIN *= mScale; |