PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove default app duplicates in search" into oc-dev

Browse Source 
am: 0c55014b88

Change-Id: I62f5fbd444836aa73b6ff801bad944c9a8fddd4b
This commit is contained in:
Matthew Fritze
2017-05-17 17:14:24 +00:00
committed by android-build-merger
parent 5a151d23ab 0c55014b88
commit 79cfaa7b91
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/applications/AdvancedAppSettings.java
View File

@@ -43,6 +43,8 @@ public class AdvancedAppSettings extends DashboardFragment {
static final String TAG = "AdvancedAppSettings";
private static final String KEY_ASSIST_VOICE_INPUT = "assist_and_voice_input";
@Override
protected String getLogTag() {
return TAG;
@@ -80,6 +82,18 @@ public class AdvancedAppSettings extends DashboardFragment {
sir.xmlResId = R.xml.app_default_settings;
return Arrays.asList(sir);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
keys.add(KEY_ASSIST_VOICE_INPUT);
// TODO (b/38230148) Remove these keys when we can differentiate work results
keys.add((new DefaultWorkPhonePreferenceController(context))
.getPreferenceKey());
keys.add((new DefaultWorkBrowserPreferenceController(context))
.getPreferenceKey());
return keys;
}
};
static class SummaryProvider implements SummaryLoader.SummaryProvider {