commit f03d074b31e33c48025e636862c9ea9d7c7da09c
author Daisuke Miyakawa <dmiyakawa@google.com> Sat Oct 29 08:27:03 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 29 08:27:03 2011 -0700
tree 08933a3f37b5d0a312f3decaf880f7086231f2bb
parent 6dc26da5b181e95f7cd051309795234da53510f0
parent 5a30a6d9aec74bf28b389b787ca5809bcb89822d

Merge "Delay SearchView preparation" into ics-mr1

src/com/android/contacts/activities/DialtactsActivity.java

diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index 917d8e0..d5ff79d 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -400,8 +400,6 @@
         mViewPager.setAdapter(new ViewPagerAdapter(getFragmentManager()));
         mViewPager.setOnPageChangeListener(mPageChangeListener);
 
-        prepareSearchView();
-
         // Setup the ActionBar tabs (the order matches the tab-index contants TAB_INDEX_*)
         setupDialer();
         setupCallLog();
@@ -814,6 +812,10 @@
      * Hides every tab and shows search UI for phone lookup.
      */
     private void enterSearchUi() {
+        if (mSearchView == null) {
+            prepareSearchView();
+        }
+
         final ActionBar actionBar = getActionBar();
 
         final Tab tab = actionBar.getSelectedTab();