diff options
| author | Isaac Katzenelson <isaack@android.com> | 2011-11-08 11:25:55 -0800 |
|---|---|---|
| committer | Isaac Katzenelson <isaack@android.com> | 2011-11-08 11:27:00 -0800 |
| commit | 998e66e1be35f347a61e50dc8e6a138b5d13e210 (patch) | |
| tree | 8b9f882a4e5265d21184514a6716db3aaf06e2bb /src/com/android/calendar/AllInOneActivity.java | |
| parent | aa05dbf94756e6b40c3331a9d0d0efb9fca16e04 (diff) | |
| download | android_packages_apps_Calendar-998e66e1be35f347a61e50dc8e6a138b5d13e210.tar.gz android_packages_apps_Calendar-998e66e1be35f347a61e50dc8e6a138b5d13e210.tar.bz2 android_packages_apps_Calendar-998e66e1be35f347a61e50dc8e6a138b5d13e210.zip | |
Show event info when launching with month view
Bug 5581237: Calendar crashes if you start in month, go home, and
open a specific event
Change-Id: I9cc854b61564dcb988e3ad141adeb21563e1c478
Diffstat (limited to 'src/com/android/calendar/AllInOneActivity.java')
| -rw-r--r-- | src/com/android/calendar/AllInOneActivity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java index b88cd25d..35603c3f 100644 --- a/src/com/android/calendar/AllInOneActivity.java +++ b/src/com/android/calendar/AllInOneActivity.java @@ -126,7 +126,7 @@ public class AllInOneActivity extends Activity implements EventHandler, private String mTimeZone; private boolean mShowCalendarControls; private boolean mShowEventInfoFullScreenAgenda; - private boolean mShowEventInfoFullScreenDay; + private boolean mShowEventInfoFullScreen; private int mWeekNum; private long mViewEventId = -1; @@ -340,8 +340,8 @@ public class AllInOneActivity extends Activity implements EventHandler, Utils.getConfigBool(this, R.bool.show_event_details_with_agenda); mShowEventInfoFullScreenAgenda = Utils.getConfigBool(this, R.bool.agenda_show_event_info_full_screen); - mShowEventInfoFullScreenDay = - Utils.getConfigBool(this, R.bool.day_show_event_info_full_screen); + mShowEventInfoFullScreen = + Utils.getConfigBool(this, R.bool.show_event_info_full_screen); Utils.setAllowWeekForDetailView(mIsMultipane); @@ -1086,8 +1086,8 @@ public class AllInOneActivity extends Activity implements EventHandler, event.selectedTime, -1, ViewType.CURRENT); } if ((mCurrentView == ViewType.AGENDA && mShowEventInfoFullScreenAgenda) || - ((mCurrentView == ViewType.DAY || (mCurrentView == ViewType.WEEK)) - && mShowEventInfoFullScreenDay)){ + ((mCurrentView == ViewType.DAY || (mCurrentView == ViewType.WEEK) || + mCurrentView == ViewType.MONTH) && mShowEventInfoFullScreen)){ // start event info as activity Intent intent = new Intent(Intent.ACTION_VIEW); Uri eventUri = ContentUris.withAppendedId(Events.CONTENT_URI, event.id); |