summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2012-05-08 15:05:33 -0700
committerMindy Pereira <mindyp@google.com>2012-05-08 15:06:54 -0700
commite0942157628776cff5573da8ce85fb3f3c3cfc35 (patch)
tree7a9bf37c5b3221eda11e06337241d115f2c0111a
parent5c7e982978167cc0da14383a6ac1647747809e3b (diff)
downloadandroid_packages_apps_Calendar-e0942157628776cff5573da8ce85fb3f3c3cfc35.tar.gz
android_packages_apps_Calendar-e0942157628776cff5573da8ce85fb3f3c3cfc35.tar.bz2
android_packages_apps_Calendar-e0942157628776cff5573da8ce85fb3f3c3cfc35.zip
Fix event title font size.
Fixes b/6434236 Nakasi: Make month view text 12dps Change-Id: I36e541236870d8fb3cc7c1f00e3ead2c0190841e
-rw-r--r--res/values-w600dp-h879dp/integers.xml2
-rw-r--r--res/values-w960dp-h527dp/integers.xml2
-rw-r--r--res/values/integers.xml2
-rw-r--r--src/com/android/calendar/month/MonthWeekEventsView.java1
4 files changed, 7 insertions, 0 deletions
diff --git a/res/values-w600dp-h879dp/integers.xml b/res/values-w600dp-h879dp/integers.xml
index 0ca0f244..e0a5931b 100644
--- a/res/values-w600dp-h879dp/integers.xml
+++ b/res/values-w600dp-h879dp/integers.xml
@@ -12,6 +12,8 @@
-->
<resources
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- size of event title font in month view -->
+ <integer name="text_size_event_title">12</integer>
<!-- size of day date font in month view -->
<integer name="text_size_month_number">24</integer>
<!-- margin between the day number and the edge of the day in month view -->
diff --git a/res/values-w960dp-h527dp/integers.xml b/res/values-w960dp-h527dp/integers.xml
index 0ca0f244..e0a5931b 100644
--- a/res/values-w960dp-h527dp/integers.xml
+++ b/res/values-w960dp-h527dp/integers.xml
@@ -12,6 +12,8 @@
-->
<resources
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- size of event title font in month view -->
+ <integer name="text_size_event_title">12</integer>
<!-- size of day date font in month view -->
<integer name="text_size_month_number">24</integer>
<!-- margin between the day number and the edge of the day in month view -->
diff --git a/res/values/integers.xml b/res/values/integers.xml
index b0f151b5..1ca466fb 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -12,6 +12,8 @@
-->
<resources
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- size of event title font in month view -->
+ <integer name="text_size_event_title">14</integer>
<!-- size of day date font in month view -->
<integer name="text_size_month_number">14</integer>
<!-- max number of lines in the description without showing More/Less button -->
diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java
index 99c8f0e7..e1c78c67 100644
--- a/src/com/android/calendar/month/MonthWeekEventsView.java
+++ b/src/com/android/calendar/month/MonthWeekEventsView.java
@@ -348,6 +348,7 @@ public class MonthWeekEventsView extends SimpleWeekView {
if (!mInitialized) {
Resources resources = getContext().getResources();
mShowDetailsInMonth = Utils.getConfigBool(getContext(), R.bool.show_details_in_month);
+ TEXT_SIZE_EVENT_TITLE = resources.getInteger(R.integer.text_size_event_title);
TEXT_SIZE_MONTH_NUMBER = resources.getInteger(R.integer.text_size_month_number);
SIDE_PADDING_MONTH_NUMBER = resources.getInteger(R.integer.month_day_number_margin);
CONFLICT_COLOR = resources.getColor(R.color.month_dna_conflict_time_color);