Merge "Revert "Settings search - Navigate user to exact page""

This commit is contained in:
TreeHugger Robot
2020-01-16 13:06:24 +00:00
committed by Android (Google) Code Review
56 changed files with 52 additions and 386 deletions

View File

@@ -31,8 +31,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.RadioButtonPreference;
import java.util.List;
@@ -40,7 +38,6 @@ import java.util.List;
/**
* Fragment for choosing default network scorer.
*/
@SearchIndexable
public class NetworkScorerPicker extends InstrumentedPreferenceFragment implements
RadioButtonPreference.OnClickListener {
@@ -145,7 +142,4 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
NetworkScoreManager createNetworkScorerManager(Context context) {
return (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.network_scorer_picker_prefs);
}