aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolai Ehemann <en@enlightened.de>2014-03-31 10:19:02 +0200
committerNicolai Ehemann <en@enlightened.de>2014-04-11 11:48:23 +0200
commit9c765fe720a398c2eb6d39b254cb5e6170c21077 (patch)
tree05d8b94829275a6ecb3f2b39d75b1fe89fbf0872 /src
parentadcf4cb26a9f4ad6b2ed1d4d92d24712e9f0c028 (diff)
downloadandroid_packages_apps_LockClock-9c765fe720a398c2eb6d39b254cb5e6170c21077.tar.gz
android_packages_apps_LockClock-9c765fe720a398c2eb6d39b254cb5e6170c21077.tar.bz2
android_packages_apps_LockClock-9c765fe720a398c2eb6d39b254cb5e6170c21077.zip
LockClock: display date range for multi-day allday appointments
Change-Id: Ibe4e05ec5e5663c1db6f168c442916a5db528de9
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/cyanogenmod/lockclock/calendar/CalendarViewsService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/lockclock/calendar/CalendarViewsService.java b/src/com/cyanogenmod/lockclock/calendar/CalendarViewsService.java
index 893d8f7..6e207e4 100755
--- a/src/com/cyanogenmod/lockclock/calendar/CalendarViewsService.java
+++ b/src/com/cyanogenmod/lockclock/calendar/CalendarViewsService.java
@@ -290,6 +290,7 @@ class CalendarRemoteViewsFactory implements RemoteViewsFactory {
final String description = cursor.getString(indexDescription);
final String location = cursor.getString(indexLocation);
final boolean allDay = cursor.getInt(indexAllDay) != 0;
+ final boolean multiDay = allDay && (end - begin) > DAY_IN_MILLIS;
int format = 0;
if (allDay) {
@@ -314,7 +315,7 @@ class CalendarRemoteViewsFactory implements RemoteViewsFactory {
} else {
format = Constants.CALENDAR_FORMAT_FUTURE;
}
- if (allDay || begin == end) {
+ if ((allDay && !multiDay) || begin == end) {
sb.append(DateUtils.formatDateTime(context, begin, format));
} else {
sb.append(DateUtils.formatDateRange(context, begin, end, format));