aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRescue9 <Rescue@corridor9.net>2013-08-03 20:25:37 -0500
committerRescue9 <Rescue@corridor9.net>2013-08-08 20:44:29 -0500
commitbb2eba0577e832f9ef8d8bbd778520e8783572ba (patch)
tree98e2d16526e82df216acb557460dbb8153f5b0a5 /src
parent4752251f0a59c57ddd92faa99f57ec97e8007b05 (diff)
downloadandroid_packages_apps_LockClock-bb2eba0577e832f9ef8d8bbd778520e8783572ba.tar.gz
android_packages_apps_LockClock-bb2eba0577e832f9ef8d8bbd778520e8783572ba.tar.bz2
android_packages_apps_LockClock-bb2eba0577e832f9ef8d8bbd778520e8783572ba.zip
LockClock: added "Today" timeframe to calendar event lookahead
Adds ability for lockclock to display only those events happening before midnight each individual day. Change-Id: Ifd9c74f0545a0fd0b2c0e7416ba8e23d5735e590 Patch 2: Rebased after 47249 commit JIRA: CYAN-1868
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/lockclock/misc/Preferences.java20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/lockclock/misc/Preferences.java b/src/com/cyanogenmod/lockclock/misc/Preferences.java
index e58483c..0bb30ff 100644
--- a/src/com/cyanogenmod/lockclock/misc/Preferences.java
+++ b/src/com/cyanogenmod/lockclock/misc/Preferences.java
@@ -22,6 +22,7 @@ import android.graphics.Color;
import com.cyanogenmod.lockclock.weather.WeatherInfo;
+import java.util.Calendar;
import java.util.Set;
public class Preferences {
@@ -192,7 +193,24 @@ public class Preferences {
}
public static long lookAheadTimeInMs(Context context) {
- return Long.parseLong(getPrefs(context).getString(Constants.CALENDAR_LOOKAHEAD, "1209600000"));
+ long lookAheadTime;
+ String preferenceSetting = getPrefs(context).getString(Constants.CALENDAR_LOOKAHEAD, "1209600000");
+
+ if (preferenceSetting.equals("today")) {
+ long now = System.currentTimeMillis();
+
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.HOUR_OF_DAY, 23);
+ cal.set(Calendar.MINUTE, 59);
+ cal.set(Calendar.SECOND, 59);
+ cal.set(Calendar.MILLISECOND, 999);
+ long endtimeToday = cal.getTimeInMillis();
+
+ lookAheadTime = endtimeToday - now;
+ } else {
+ lookAheadTime = Long.parseLong(preferenceSetting);
+ }
+ return lookAheadTime;
}
public static final int SHOW_NEVER = 0;