diff options
author | Isaac Katzenelson <isaack@android.com> | 2012-05-02 16:46:44 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-02 16:46:44 -0700 |
commit | 21e815bd1dc21ba9951ce703b3808e16e3bf85cf (patch) | |
tree | 74a7483d3e64aae9dc1a6408a3e7fe2c38c57858 /src/com/android/calendar/EventInfoActivity.java | |
parent | 828df5020067aa477adbe1eefd88afa3fc5de900 (diff) | |
download | android_packages_apps_Calendar-21e815bd1dc21ba9951ce703b3808e16e3bf85cf.tar.gz android_packages_apps_Calendar-21e815bd1dc21ba9951ce703b3808e16e3bf85cf.tar.bz2 android_packages_apps_Calendar-21e815bd1dc21ba9951ce703b3808e16e3bf85cf.zip |
Revert "Fix back and home behavior"
This reverts commit 828df5020067aa477adbe1eefd88afa3fc5de900
Diffstat (limited to 'src/com/android/calendar/EventInfoActivity.java')
-rw-r--r-- | src/com/android/calendar/EventInfoActivity.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java index 0ea6b369..4b6827b4 100644 --- a/src/com/android/calendar/EventInfoActivity.java +++ b/src/com/android/calendar/EventInfoActivity.java @@ -24,12 +24,9 @@ import android.app.ActionBar; import android.app.Activity; import android.app.FragmentManager; import android.app.FragmentTransaction; -import android.content.ContentUris; import android.content.Intent; -import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; -import android.provider.CalendarContract.Events; import android.util.Log; public class EventInfoActivity extends Activity { @@ -71,11 +68,10 @@ public class EventInfoActivity extends Activity { } } - // If we do not support showing full screen event info in this configuration, - // close the activity and show the event in AllInOne. - Resources res = getResources(); - if (!res.getBoolean(R.bool.agenda_show_event_info_full_screen) - && !res.getBoolean(R.bool.show_event_info_full_screen)) { + // Never show this activity if we support showing double pane agenda view + // If we do support this, instead launch AllInOneActivity in double pane mode + // This can happen if this activity is launched while in portrait mode in sw600dp + if (!getResources().getBoolean(R.bool.agenda_show_event_info_full_screen)) { CalendarController.getInstance(this) .launchViewEvent(mEventId, mStartMillis, mEndMillis); finish(); |