commit 71b221ae5d0f514352584a955630f5494f686c51
author Michael Chan <mchan@android.com> Mon Oct 25 17:55:44 2010 -0700
committer Michael Chan <mchan@android.com> Tue Oct 26 17:38:53 2010 -0700
tree 49158d8035efc21e74a438617d60f9f4d83bf860
parent be8191cfc03d14395fe2b6a5fc277c10111d1362

Update Event Popup

- Update UI per spec
- Remove organizer, reminder, attendee presence.
- Reenable showing of calendar email if the calendar display name isn't unique.

Change-Id: I8d9f022c0745e98e71726a8cdccfb4a681024c95

src/com/android/calendar/AllInOneActivity.java

diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 76d6967..b8221e8 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -320,8 +320,10 @@
         getMenuInflater().inflate(R.menu.all_in_one_title_bar, menu);
 
         SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
-        searchView.setIconifiedByDefault(true);
-        searchView.setOnQueryChangeListener(this);
+        if (searchView != null) {
+            searchView.setIconifiedByDefault(true);
+            searchView.setOnQueryChangeListener(this);
+        }
 
         return true;
     }