diff options
author | Jay Shrauner <shrauner@google.com> | 2013-08-29 10:52:40 -0700 |
---|---|---|
committer | Jay Shrauner <shrauner@google.com> | 2013-08-29 11:14:37 -0700 |
commit | 2e5b34b14181f367ec90198f5cbcd39f261b7bf5 (patch) | |
tree | af11fe27dc77c02f7f25e990f12144e6f00c590a /src | |
parent | ede14b685dc83df2aa48194776d881f7e3191032 (diff) |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 8 | ||||
-rw-r--r-- | src/com/android/dialer/list/RegularSearchFragment.java | 30 | ||||
-rw-r--r-- | src/com/android/dialer/list/SearchFragment.java (renamed from src/com/android/dialer/SearchFragment.java) | 13 | ||||
-rw-r--r-- | src/com/android/dialer/list/SmartDialSearchFragment.java | 6 |
4 files changed, 36 insertions, 21 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index d8fe1ab47..4e5592a52 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -76,6 +76,8 @@ import com.android.dialer.interactions.PhoneNumberInteraction; 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 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O /** * 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 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 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 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O if (smartDialSearch) { fragment = new SmartDialSearchFragment(); } else { - fragment = new SearchFragment(); + fragment = new RegularSearchFragment(); } transaction.replace(R.id.dialtacts_frame, fragment, tag); } else { diff --git a/src/com/android/dialer/list/RegularSearchFragment.java b/src/com/android/dialer/list/RegularSearchFragment.java new file mode 100644 index 000000000..47dd07532 --- /dev/null +++ b/src/com/android/dialer/list/RegularSearchFragment.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.dialer.list; + +public class RegularSearchFragment extends SearchFragment { + + private static final int SEARCH_DIRECTORY_RESULT_LIMIT = 5; + + public RegularSearchFragment() { + configureDirectorySearch(); + } + + public void configureDirectorySearch() { + setDirectorySearchEnabled(true); + setDirectoryResultLimit(SEARCH_DIRECTORY_RESULT_LIMIT); + } +} diff --git a/src/com/android/dialer/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index 0a97804e0..54ee43600 100644 --- a/src/com/android/dialer/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.dialer; +package com.android.dialer.list; import android.app.Activity; import android.widget.AbsListView; @@ -26,19 +26,8 @@ import com.android.dialer.list.OnListFragmentScrolledListener; public class SearchFragment extends PhoneNumberPickerFragment { - private static final int SEARCH_DIRECTORY_RESULT_LIMIT = 5; - private OnListFragmentScrolledListener mActivityScrollListener; - public SearchFragment() { - configureDirectorySearch(); - } - - public void configureDirectorySearch() { - setDirectorySearchEnabled(true); - setDirectoryResultLimit(SEARCH_DIRECTORY_RESULT_LIMIT); - } - @Override public void onAttach(Activity activity) { super.onAttach(activity); diff --git a/src/com/android/dialer/list/SmartDialSearchFragment.java b/src/com/android/dialer/list/SmartDialSearchFragment.java index fd2aa357e..e3882ca50 100644 --- a/src/com/android/dialer/list/SmartDialSearchFragment.java +++ b/src/com/android/dialer/list/SmartDialSearchFragment.java @@ -22,7 +22,6 @@ import android.os.Bundle; import android.util.Log; import com.android.contacts.common.list.ContactEntryListAdapter; -import com.android.dialer.SearchFragment; import com.android.dialer.dialpad.SmartDialCursorLoader; /** @@ -31,11 +30,6 @@ import com.android.dialer.dialpad.SmartDialCursorLoader; public class SmartDialSearchFragment extends SearchFragment { private static final String TAG = SmartDialSearchFragment.class.getSimpleName(); - @Override - public void configureDirectorySearch() { - setDirectorySearchEnabled(false); - } - /** * Creates a SmartDialListAdapter to display and operate on search results. */ |