Settings search - Navigate user to exact page
- remove duplicate index preference - default set searchable = false when the preference has fragment - make some fragments indexable Bug: 143057584 Test: robotest & manual Change-Id: I4d64f6106d2f92f0a45e8c7e26388677f593f412
This commit is contained in:
@@ -29,7 +29,13 @@ import com.android.settings.SummaryPreference;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.applications.ProcStatsData.MemInfo;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settingslib.search.SearchIndexable;
|
||||
|
||||
/**
|
||||
* Settings screen to provide memory stats summary
|
||||
*/
|
||||
@SearchIndexable
|
||||
public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {
|
||||
|
||||
private static final String KEY_STATUS_HEADER = "status_header";
|
||||
@@ -125,4 +131,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider(R.xml.process_stats_summary);
|
||||
}
|
||||
|
||||
@@ -27,11 +27,17 @@ import android.text.TextUtils;
|
||||
import com.android.internal.app.AssistUtils;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settingslib.applications.DefaultAppInfo;
|
||||
import com.android.settingslib.search.SearchIndexable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Fragment for picking assistant voice input
|
||||
*/
|
||||
@SearchIndexable
|
||||
public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
|
||||
|
||||
private VoiceInputHelper mHelper;
|
||||
@@ -166,4 +172,7 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
|
||||
return new Intent(Intent.ACTION_MAIN).setComponent(mInfo.settings);
|
||||
}
|
||||
}
|
||||
|
||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider(R.xml.default_voice_settings);
|
||||
}
|
||||
|
||||
@@ -37,7 +37,6 @@ import java.util.List;
|
||||
public class ManageAssist extends DashboardFragment {
|
||||
|
||||
private static final String TAG = "ManageAssist";
|
||||
private static final String KEY_ASSIST = "gesture_assist_application";
|
||||
|
||||
@Override
|
||||
protected String getLogTag() {
|
||||
@@ -85,12 +84,5 @@ public class ManageAssist extends DashboardFragment {
|
||||
Context context) {
|
||||
return buildPreferenceControllers(context, null /* lifecycle */);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getNonIndexableKeys(Context context) {
|
||||
List<String> keys = super.getNonIndexableKeys(context);
|
||||
keys.add(KEY_ASSIST);
|
||||
return keys;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user