diff options
| author | Khalid Zubair <kzubair@cyngn.com> | 2016-02-16 17:38:02 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2016-02-20 09:39:50 -0800 |
| commit | 753f27dbc408a1314fd2d223cc54d6e6f04346a3 (patch) | |
| tree | 17dc32707b3fe5814eee6b0c992efaf1df91d4a9 | |
| parent | 1f1a0aacf7db8777a03dc39f0a3e7bccb78e28bb (diff) | |
| download | android_packages_apps_LockClock-753f27dbc408a1314fd2d223cc54d6e6f04346a3.tar.gz android_packages_apps_LockClock-753f27dbc408a1314fd2d223cc54d6e6f04346a3.tar.bz2 android_packages_apps_LockClock-753f27dbc408a1314fd2d223cc54d6e6f04346a3.zip | |
LockClock: Enable all calendars during first time setup
Calendars added later have to be manually enabled by the user.
CYNGNOS-2062, CYNGNOS-1871
Change-Id: Ib43a920ce350347af41a8f32f59f581bd3c0e236
| -rw-r--r-- | res/xml/preferences_calendar.xml | 3 | ||||
| -rw-r--r-- | src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/res/xml/preferences_calendar.xml b/res/xml/preferences_calendar.xml index b686bcf..26bf4f4 100644 --- a/res/xml/preferences_calendar.xml +++ b/res/xml/preferences_calendar.xml @@ -31,8 +31,7 @@ android:dependency="show_calendar" android:dialogTitle="@string/calendars_title" android:title="@string/calendars_title" - android:summary="@string/calendars_summary" - android:defaultValue="@array/empty_array" /> + android:summary="@string/calendars_summary" /> <ListPreference android:key="calendar_lookahead" diff --git a/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java b/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java index 050e5ad..2d6b4a8 100644 --- a/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java +++ b/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java @@ -41,6 +41,7 @@ import com.cyanogenmod.lockclock.misc.Constants; import java.util.ArrayList; import java.util.List; +import java.util.HashSet; public class CalendarPreferences extends PreferenceFragment implements OnSharedPreferenceChangeListener, Preference.OnPreferenceChangeListener { @@ -128,8 +129,18 @@ public class CalendarPreferences extends PreferenceFragment implements MultiSelectListPreference calendarList = (MultiSelectListPreference) findPreference(Constants.CALENDAR_LIST); CalendarEntries calEntries = CalendarEntries.findCalendars(getActivity()); + + boolean firstTime = com.cyanogenmod.lockclock.misc.Preferences.calendarsToDisplay(mContext) == null; calendarList.setEntries(calEntries.getEntries()); calendarList.setEntryValues(calEntries.getEntryValues()); + if (firstTime) { + // by default, select all the things + HashSet defaults = new HashSet(); + for (CharSequence s : calEntries.getEntryValues()) { + defaults.add((String) s); + } + calendarList.setValues(defaults); + } if (calEntries.getEntryValues().length == 0) { calendarList.setSummary(R.string.calendars_none_found_summary); |