commit 2e5b34b14181f367ec90198f5cbcd39f261b7bf5
author Jay Shrauner <shrauner@google.com> Thu Aug 29 10:52:40 2013 -0700
committer Jay Shrauner <shrauner@google.com> Thu Aug 29 11:14:37 2013 -0700
tree af11fe27dc77c02f7f25e990f12144e6f00c590a
parent ede14b685dc83df2aa48194776d881f7e3191032

Refactor SearchFragment

Refactor SearchFragment into a base SearchFragment and an
implementation RegularSearchFragment. This allows SmartDialSearchFragment
to inherit directly from the base.

Bug:
Change-Id: Iae9cd11ac733445c76d390c35fa778d942707b57

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index d8fe1ab..4e5592a 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -76,6 +76,8 @@
 import com.android.dialer.list.AllContactsActivity;
 import com.android.dialer.list.PhoneFavoriteFragment;
 import com.android.dialer.list.OnListFragmentScrolledListener;
+import com.android.dialer.list.RegularSearchFragment;
+import com.android.dialer.list.SearchFragment;
 import com.android.dialer.list.SmartDialSearchFragment;
 import com.android.dialerbind.DatabaseHelperManager;
 import com.android.internal.telephony.ITelephony;
@@ -138,7 +140,7 @@
     /**
      * Fragment for searching phone numbers using the alphanumeric keyboard.
      */
-    private SearchFragment mRegularSearchFragment;
+    private RegularSearchFragment mRegularSearchFragment;
 
     /**
      * Fragment for searching phone numbers using the dialpad.
@@ -322,7 +324,7 @@
             mSmartDialSearchFragment.setOnPhoneNumberPickerActionListener(
                     mPhoneNumberPickerActionListener);
         } else if (fragment instanceof SearchFragment) {
-            mRegularSearchFragment = (SearchFragment) fragment;
+            mRegularSearchFragment = (RegularSearchFragment) fragment;
             mRegularSearchFragment.setOnPhoneNumberPickerActionListener(
                     mPhoneNumberPickerActionListener);
         } else if (fragment instanceof PhoneFavoriteFragment) {
@@ -770,7 +772,7 @@
             if (smartDialSearch) {
                 fragment = new SmartDialSearchFragment();
             } else {
-                fragment = new SearchFragment();
+                fragment = new RegularSearchFragment();
             }
             transaction.replace(R.id.dialtacts_frame, fragment, tag);
         } else {