diff options
| author | Isaac Katzenelson <isaack@android.com> | 2013-09-06 17:56:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-06 17:56:54 +0000 |
| commit | cd12ebd40d70f4d9b31b7a042818cc740073f75a (patch) | |
| tree | a3164ce5bc3a06fd1b0f95f72ff127b214dd5df2 /src | |
| parent | e8305d6e1674bcc7cdb4e99e50f48fbcfd23d4db (diff) | |
| parent | ffd6101165b330a379bc7e73ebf88583a74198b0 (diff) | |
| download | android_packages_apps_Calendar-cd12ebd40d70f4d9b31b7a042818cc740073f75a.tar.gz android_packages_apps_Calendar-cd12ebd40d70f4d9b31b7a042818cc740073f75a.tar.bz2 android_packages_apps_Calendar-cd12ebd40d70f4d9b31b7a042818cc740073f75a.zip | |
Merge "Support PreferenceActivity.isValidFragment" into ics-ub-calendar-fuchsia
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/calendar/CalendarSettingsActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/calendar/CalendarSettingsActivity.java b/src/com/android/calendar/CalendarSettingsActivity.java index 0584521f..a864b532 100644 --- a/src/com/android/calendar/CalendarSettingsActivity.java +++ b/src/com/android/calendar/CalendarSettingsActivity.java @@ -112,6 +112,12 @@ public class CalendarSettingsActivity extends PreferenceActivity { super.onPause(); } + @Override + protected boolean isValidFragment(String fragmentName) { + // This activity is not exported so we can just approve everything + return true; + } + Runnable mCheckAccounts = new Runnable() { @Override public void run() { |