From 58d0b2a7cdd4b988f527f03a7cb4ba2a4b7cd145 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Wed, 21 Mar 2018 16:57:10 -0700 Subject: Delete old search, old contacts, p13n logger, filtered numbers add number search. These components are safe to delete because: - New Contacts has been in prod for several releases. - New Search has been in in prod for 2 releases. - p13n logger was based on old search and is no longer being implemented in Dialer. - Filtered Number Settings contact search since we no longer support M. Bug: 37208802,73902692 Test: tap PiperOrigin-RevId: 189992017 Change-Id: I2720a252ababd164b5d0fb1011753a3c96a704d1 --- java/com/android/dialer/app/DialtactsActivity.java | 189 +-------------------- 1 file changed, 9 insertions(+), 180 deletions(-) (limited to 'java/com/android/dialer/app/DialtactsActivity.java') diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 1a8e5cc9c..a9a11e008 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -26,7 +26,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Configuration; import android.content.res.Resources; -import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; @@ -34,7 +33,6 @@ import android.os.Trace; import android.provider.CallLog.Calls; import android.provider.ContactsContract.QuickContact; import android.speech.RecognizerIntent; -import android.support.annotation.MainThread; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; import android.support.design.widget.CoordinatorLayout; @@ -66,9 +64,6 @@ import android.widget.TextView; import android.widget.Toast; import com.android.contacts.common.dialog.ClearFrequentsDialog; import com.android.contacts.common.list.OnPhoneNumberPickerActionListener; -import com.android.contacts.common.list.PhoneNumberListAdapter; -import com.android.contacts.common.list.PhoneNumberPickerFragment.CursorReranker; -import com.android.contacts.common.list.PhoneNumberPickerFragment.OnLoadFinishedListener; import com.android.dialer.animation.AnimUtils; import com.android.dialer.animation.AnimationListenerAdapter; import com.android.dialer.app.calllog.CallLogActivity; @@ -84,9 +79,6 @@ import com.android.dialer.app.list.OldSpeedDialFragment; import com.android.dialer.app.list.OnDragDropListener; import com.android.dialer.app.list.OnListFragmentScrolledListener; import com.android.dialer.app.list.PhoneFavoriteSquareTileView; -import com.android.dialer.app.list.RegularSearchFragment; -import com.android.dialer.app.list.SearchFragment; -import com.android.dialer.app.list.SmartDialSearchFragment; import com.android.dialer.app.settings.DialerSettingsActivity; import com.android.dialer.app.widget.ActionBarController; import com.android.dialer.app.widget.SearchEditTextLayout; @@ -120,11 +112,6 @@ import com.android.dialer.logging.ScreenEvent; import com.android.dialer.logging.UiAction; import com.android.dialer.metrics.Metrics; import com.android.dialer.metrics.MetricsComponent; -import com.android.dialer.p13n.inference.P13nRanking; -import com.android.dialer.p13n.inference.protocol.P13nRanker; -import com.android.dialer.p13n.inference.protocol.P13nRanker.P13nRefreshCompleteListener; -import com.android.dialer.p13n.logging.P13nLogger; -import com.android.dialer.p13n.logging.P13nLogging; import com.android.dialer.performancereport.PerformanceReport; import com.android.dialer.postcall.PostCall; import com.android.dialer.precall.PreCall; @@ -161,7 +148,6 @@ public class DialtactsActivity extends TransactionSafeActivity ContactsFragment.OnContactsListScrolledListener, DialpadFragment.HostInterface, OldSpeedDialFragment.HostInterface, - SearchFragment.HostInterface, OnDragDropListener, OnPhoneNumberPickerActionListener, PopupMenu.OnMenuItemClickListener, @@ -192,8 +178,6 @@ public class DialtactsActivity extends TransactionSafeActivity private static final String KEY_IS_DIALPAD_SHOWN = "is_dialpad_shown"; private static final String KEY_FAB_VISIBLE = "fab_visible"; private static final String TAG_NEW_SEARCH_FRAGMENT = "new_search"; - private static final String TAG_REGULAR_SEARCH_FRAGMENT = "search"; - private static final String TAG_SMARTDIAL_SEARCH_FRAGMENT = "smartdial"; private static final String TAG_FAVORITES_FRAGMENT = "favorites"; /** Just for backward compatibility. Should behave as same as {@link Intent#ACTION_DIAL}. */ private static final String ACTION_TOUCH_DIALER = "com.android.phone.action.TOUCH_DIALER"; @@ -212,11 +196,6 @@ public class DialtactsActivity extends TransactionSafeActivity /** Root layout of DialtactsActivity */ private CoordinatorLayout parentLayout; - /** Fragment for searching phone numbers using the alphanumeric keyboard. */ - private RegularSearchFragment regularSearchFragment; - - /** Fragment for searching phone numbers using the dialpad. */ - private SmartDialSearchFragment smartDialSearchFragment; /** new Fragment for search phone numbers using the keyboard and the dialpad. */ private NewSearchFragment newSearchFragment; @@ -267,8 +246,6 @@ public class DialtactsActivity extends TransactionSafeActivity private boolean wasConfigurationChange; private long timeTabSelected; - private P13nLogger p13nLogger; - private P13nRanker p13nRanker; public boolean isMultiSelectModeEnabled; private boolean isLastTabEnabled; @@ -312,7 +289,6 @@ public class DialtactsActivity extends TransactionSafeActivity LogUtil.v("DialtactsActivity.onTextChanged", "previous query: " + searchQuery); searchQuery = newText; - // TODO(calderwoodra): show p13n when newText is empty. // Show search fragment only when the query string is changed to non-empty text. if (!TextUtils.isEmpty(newText)) { // Call enterSearchUi only if we are switching search modes, or showing a search @@ -324,11 +300,7 @@ public class DialtactsActivity extends TransactionSafeActivity } } - if (smartDialSearchFragment != null && smartDialSearchFragment.isVisible()) { - smartDialSearchFragment.setQueryString(searchQuery); - } else if (regularSearchFragment != null && regularSearchFragment.isVisible()) { - regularSearchFragment.setQueryString(searchQuery); - } else if (newSearchFragment != null && newSearchFragment.isVisible()) { + if (newSearchFragment != null && newSearchFragment.isVisible()) { newSearchFragment.setQuery(searchQuery, getCallInitiationType()); } } @@ -496,14 +468,9 @@ public class DialtactsActivity extends TransactionSafeActivity SmartDialPrefix.initializeNanpSettings(this); Trace.endSection(); - p13nLogger = P13nLogging.get(getApplicationContext()); - p13nRanker = P13nRanking.get(getApplicationContext()); Trace.endSection(); - // Update the new search fragment to the correct position and the ActionBar's visibility. - if (ConfigProviderBindings.get(this).getBoolean("enable_new_search_fragment", false)) { - updateSearchFragmentPosition(); - } + updateSearchFragmentPosition(); } @NonNull @@ -624,14 +591,6 @@ public class DialtactsActivity extends TransactionSafeActivity setSearchBoxHint(); timeTabSelected = SystemClock.elapsedRealtime(); - p13nLogger.reset(); - p13nRanker.refresh( - new P13nRefreshCompleteListener() { - @Override - public void onP13nRefreshComplete() { - // TODO(strongarm): make zero-query search results visible - } - }); Trace.endSection(); } @@ -696,15 +655,6 @@ public class DialtactsActivity extends TransactionSafeActivity LogUtil.i("DialtactsActivity.onAttachFragment", "fragment: %s", fragment); if (fragment instanceof DialpadFragment) { dialpadFragment = (DialpadFragment) fragment; - } else if (fragment instanceof SmartDialSearchFragment) { - smartDialSearchFragment = (SmartDialSearchFragment) fragment; - smartDialSearchFragment.setOnPhoneNumberPickerActionListener(this); - if (!TextUtils.isEmpty(dialpadQuery)) { - smartDialSearchFragment.setAddToContactNumber(dialpadQuery); - } - } else if (fragment instanceof SearchFragment) { - regularSearchFragment = (RegularSearchFragment) fragment; - regularSearchFragment.setOnPhoneNumberPickerActionListener(this); } else if (fragment instanceof ListsFragment) { listsFragment = (ListsFragment) fragment; listsFragment.addOnPageChangeListener(this); @@ -712,28 +662,6 @@ public class DialtactsActivity extends TransactionSafeActivity newSearchFragment = (NewSearchFragment) fragment; updateSearchFragmentPosition(); } - if (fragment instanceof SearchFragment) { - final SearchFragment searchFragment = (SearchFragment) fragment; - searchFragment.setReranker( - new CursorReranker() { - @Override - @MainThread - public Cursor rerankCursor(Cursor data) { - Assert.isMainThread(); - String queryString = searchFragment.getQueryString(); - return p13nRanker.rankCursor(data, queryString == null ? 0 : queryString.length()); - } - }); - searchFragment.addOnLoadFinishedListener( - new OnLoadFinishedListener() { - @Override - public void onLoadFinished() { - p13nLogger.onSearchQuery( - searchFragment.getQueryString(), - (PhoneNumberListAdapter) searchFragment.getAdapter()); - } - }); - } } protected void handleMenuSettings() { @@ -1001,24 +929,7 @@ public class DialtactsActivity extends TransactionSafeActivity } private void updateSearchFragmentPosition() { - SearchFragment fragment = null; - if (smartDialSearchFragment != null) { - fragment = smartDialSearchFragment; - } else if (regularSearchFragment != null) { - fragment = regularSearchFragment; - } - LogUtil.d( - "DialtactsActivity.updateSearchFragmentPosition", - "fragment: %s, isVisible: %b", - fragment, - fragment != null && fragment.isVisible()); - if (fragment != null) { - // We need to force animation here even when fragment is not visible since it might not be - // visible immediately after screen orientation change and dialpad height would not be - // available immediately which is required to update position. By forcing an animation, - // position will be updated after a delay by when the dialpad height would be available. - fragment.updatePosition(true /* animate */); - } else if (newSearchFragment != null) { + if (newSearchFragment != null) { int animationDuration = getResources().getInteger(R.integer.dialpad_slide_in_duration); int actionbarHeight = getResources().getDimensionPixelSize(R.dimen.action_bar_height_large); int shadowHeight = getResources().getDrawable(R.drawable.search_shadow).getIntrinsicHeight(); @@ -1208,29 +1119,9 @@ public class DialtactsActivity extends TransactionSafeActivity return; } - final FragmentTransaction transaction = getFragmentManager().beginTransaction(); - if (inDialpadSearch && smartDialSearchFragment != null) { - transaction.remove(smartDialSearchFragment); - } else if (inRegularSearch && regularSearchFragment != null) { - transaction.remove(regularSearchFragment); - } - - final String tag; - inDialpadSearch = false; - inRegularSearch = false; - inNewSearch = false; - boolean useNewSearch = - ConfigProviderBindings.get(this).getBoolean("enable_new_search_fragment", false); - if (useNewSearch) { - tag = TAG_NEW_SEARCH_FRAGMENT; - inNewSearch = true; - } else if (smartDialSearch) { - tag = TAG_SMARTDIAL_SEARCH_FRAGMENT; - inDialpadSearch = true; - } else { - tag = TAG_REGULAR_SEARCH_FRAGMENT; - inRegularSearch = true; - } + FragmentTransaction transaction = getFragmentManager().beginTransaction(); + String tag = TAG_NEW_SEARCH_FRAGMENT; + inNewSearch = true; floatingActionButtonController.scaleOut(); @@ -1240,59 +1131,23 @@ public class DialtactsActivity extends TransactionSafeActivity transaction.setTransition(FragmentTransaction.TRANSIT_NONE); } - Fragment fragment = getFragmentManager().findFragmentByTag(tag); + NewSearchFragment fragment = (NewSearchFragment) getFragmentManager().findFragmentByTag(tag); if (fragment == null) { - if (useNewSearch) { - fragment = NewSearchFragment.newInstance(!isDialpadShown()); - } else if (smartDialSearch) { - fragment = new SmartDialSearchFragment(); - } else { - fragment = Bindings.getLegacy(this).newRegularSearchFragment(); - ((SearchFragment) fragment) - .setOnTouchListener( - (v, event) -> { - // Show the FAB when the user touches the lists fragment and the soft - // keyboard is hidden. - hideDialpadFragment(true, false); - v.performClick(); - return false; - }); - } + fragment = NewSearchFragment.newInstance(!isDialpadShown()); transaction.add(R.id.dialtacts_frame, fragment, tag); } else { - // TODO(calderwoodra): if this is a transition from dialpad to searchbar, animate fragment - // down, and vice versa. Perhaps just add a coordinator behavior with the search bar. transaction.show(fragment); } // DialtactsActivity will provide the options menu fragment.setHasOptionsMenu(false); - - // Will show empty list if P13nRanker is not enabled. Else, re-ranked list by the ranker. - if (!useNewSearch) { - ((SearchFragment) fragment) - .setShowEmptyListForNullQuery(p13nRanker.shouldShowEmptyListForNullQuery()); - } else { - // TODO(calderwoodra): add p13n ranker to new search. - } - - if (!smartDialSearch && !useNewSearch) { - ((SearchFragment) fragment).setQueryString(query); - } else if (useNewSearch) { - ((NewSearchFragment) fragment).setQuery(query, getCallInitiationType()); - } + fragment.setQuery(query, getCallInitiationType()); transaction.commit(); if (animate) { Assert.isNotNull(listsFragment.getView()).animate().alpha(0).withLayer(); } listsFragment.setUserVisibleHint(false); - - if (smartDialSearch) { - Logger.get(this).logScreenView(ScreenEvent.Type.SMART_DIAL_SEARCH, this); - } else { - Logger.get(this).logScreenView(ScreenEvent.Type.REGULAR_SEARCH, this); - } } /** Hides the search fragment */ @@ -1336,12 +1191,6 @@ public class DialtactsActivity extends TransactionSafeActivity } final FragmentTransaction transaction = getFragmentManager().beginTransaction(); - if (smartDialSearchFragment != null) { - transaction.remove(smartDialSearchFragment); - } - if (regularSearchFragment != null) { - transaction.remove(regularSearchFragment); - } if (newSearchFragment != null) { transaction.remove(newSearchFragment); } @@ -1405,9 +1254,6 @@ public class DialtactsActivity extends TransactionSafeActivity @Override public void onDialpadQueryChanged(String query) { dialpadQuery = query; - if (smartDialSearchFragment != null) { - smartDialSearchFragment.setAddToContactNumber(query); - } if (newSearchFragment != null) { newSearchFragment.setRawNumber(query); } @@ -1443,13 +1289,6 @@ public class DialtactsActivity extends TransactionSafeActivity @Override public boolean onDialpadSpacerTouchWithEmptyQuery() { - if (inDialpadSearch - && smartDialSearchFragment != null - && !smartDialSearchFragment.isShowingPermissionRequest()) { - PerformanceReport.recordClick(UiAction.Type.CLOSE_DIALPAD); - hideDialpadFragment(true /* animate */, true /* clearDialpad */); - return true; - } return false; } @@ -1625,24 +1464,14 @@ public class DialtactsActivity extends TransactionSafeActivity @Override public void onPageScrollStateChanged(int state) {} - @Override public boolean isActionBarShowing() { return actionBarController.isActionBarShowing(); } - @Override public boolean isDialpadShown() { return isDialpadShown; } - @Override - public int getDialpadHeight() { - if (dialpadFragment != null) { - return dialpadFragment.getDialpadHeight(); - } - return 0; - } - @Override public void setActionBarHideOffset(int offset) { getActionBarSafely().setHideOffset(offset); -- cgit v1.2.3