diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-16 14:55:36 -0700 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-16 22:25:01 -0700 |
| commit | 4b441bd6544fe6d11be75f974a41afd8fa040a4f (patch) | |
| tree | d1bf0cca8d0ae780467b93b9261e8ba2c037ca8f /src/com/android/calendar/CalendarEventModel.java | |
| parent | 60973212fe9699240966c2140bc121b562726e18 (diff) | |
| download | android_packages_apps_Calendar-4b441bd6544fe6d11be75f974a41afd8fa040a4f.tar.gz android_packages_apps_Calendar-4b441bd6544fe6d11be75f974a41afd8fa040a4f.tar.bz2 android_packages_apps_Calendar-4b441bd6544fe6d11be75f974a41afd8fa040a4f.zip | |
Make settings screen support two pane mode.
1) Rename CalendarPreferenceActivity to GeneralPreferences, and
add CalendarSettingsActivity for top-level Activity.
We should retain previous logs for CalendarPreferenceActivity,
and we shouldn't call it "Activity" any more, as it is Fragment.
I'm not sure whether the new "CalendarSettingsActivity" should
be named so, or renaming it to "CalendarPreferenceActivity"
to keep consistency around naming.
2) Add necessary xmls.
Some of them are derived from Settings app, which already has
new two pane structure, so refering its logic seems enough for now.
Change-Id: I6a0b04bb824d06c2842cbd8127e2860c45350987
Diffstat (limited to 'src/com/android/calendar/CalendarEventModel.java')
| -rw-r--r-- | src/com/android/calendar/CalendarEventModel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/calendar/CalendarEventModel.java b/src/com/android/calendar/CalendarEventModel.java index 7af45fde..3d382bde 100644 --- a/src/com/android/calendar/CalendarEventModel.java +++ b/src/com/android/calendar/CalendarEventModel.java @@ -134,8 +134,8 @@ public class CalendarEventModel { public CalendarEventModel(Context context) { this(); - SharedPreferences prefs = CalendarPreferenceActivity.getSharedPreferences(context); - String defaultReminder = prefs.getString(CalendarPreferenceActivity.KEY_DEFAULT_REMINDER, + SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context); + String defaultReminder = prefs.getString(GeneralPreferences.KEY_DEFAULT_REMINDER, "0"); int defaultReminderMins = Integer.parseInt(defaultReminder); if (defaultReminderMins != 0) { |