diff options
| -rw-r--r-- | res/menu/all_in_one_title_bar.xml | 14 | ||||
| -rw-r--r-- | src/com/android/calendar/AgendaWindowAdapter.java | 18 | ||||
| -rw-r--r-- | src/com/android/calendar/AllInOneActivity.java | 3 | ||||
| -rw-r--r-- | src/com/android/calendar/SearchActivity.java | 2 |
4 files changed, 14 insertions, 23 deletions
diff --git a/res/menu/all_in_one_title_bar.xml b/res/menu/all_in_one_title_bar.xml index eaf132e5..bdec4daf 100644 --- a/res/menu/all_in_one_title_bar.xml +++ b/res/menu/all_in_one_title_bar.xml @@ -17,11 +17,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/action_refresh" - android:alphabeticShortcut="r" - android:title="@string/calendar_refresh" - android:icon="@drawable/ic_menu_refresh" /> - <item android:id="@+id/action_day" android:alphabeticShortcut="d" android:title="@string/day_view" @@ -57,6 +52,15 @@ android:title="@string/event_create" android:icon="@android:drawable/ic_menu_add" android:showAsAction="always" /> + <item android:id="@+id/action_search" + android:alphabeticShortcut="f" + android:title="@string/search" + android:icon="@android:drawable/ic_menu_search" /> + <item + android:id="@+id/action_refresh" + android:alphabeticShortcut="r" + android:title="@string/calendar_refresh" + android:icon="@drawable/ic_menu_refresh" /> <item android:id="@+id/action_manage_calendars" android:alphabeticShortcut="c" diff --git a/src/com/android/calendar/AgendaWindowAdapter.java b/src/com/android/calendar/AgendaWindowAdapter.java index e3720d46..2999248a 100644 --- a/src/com/android/calendar/AgendaWindowAdapter.java +++ b/src/com/android/calendar/AgendaWindowAdapter.java @@ -492,10 +492,6 @@ public class AgendaWindowAdapter extends BaseAdapter { } public void refresh(Time goToTime, String searchQuery, boolean forced) { - if (!Utils.equals(searchQuery, mSearchQuery)) { - // When we change search terms, clean up any old state, start over - resetInstanceFields(); - } mSearchQuery = searchQuery; if (DEBUGLOG) { Log.e(TAG, "refresh " + goToTime.toString() + (forced ? " forced" : " not forced")); @@ -567,20 +563,6 @@ public class AgendaWindowAdapter extends BaseAdapter { } } - /** - * Resets any transient state in this instance and puts it back into a state - * where it can be treated as a newly instantiated adapter - * - * TODO are these all of the fields that need to be reset? - */ - private void resetInstanceFields() { - mEmptyCursorCount = 0; - mNewerRequests = 0; - mNewerRequestsProcessed = 0; - mOlderRequests = 0; - mOlderRequestsProcessed = 0; - } - private String buildQuerySelection() { // Respect the preference to show/hide declined events diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java index 8ef8ef53..4e9bc504 100644 --- a/src/com/android/calendar/AllInOneActivity.java +++ b/src/com/android/calendar/AllInOneActivity.java @@ -152,6 +152,9 @@ public class AllInOneActivity extends Activity implements EventHandler, t = new Time(); t.setToNow(); break; + case R.id.action_search: + onSearchRequested(); + return true; case R.id.action_create_event: mController.sendEventRelatedEvent(this, EventType.CREATE_EVENT, -1, 0, 0, 0, 0); return true; diff --git a/src/com/android/calendar/SearchActivity.java b/src/com/android/calendar/SearchActivity.java index 0ff8e787..2aefe7ee 100644 --- a/src/com/android/calendar/SearchActivity.java +++ b/src/com/android/calendar/SearchActivity.java @@ -202,6 +202,8 @@ public class SearchActivity extends Activity implements Navigator { } private void search(String searchQuery) { + mAgendaListView = new AgendaListView(this); + setContentView(mAgendaListView); mAgendaListView.search(searchQuery, true); } |