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

Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev

Browse Source 
am: 4bd0f411ce

Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d
This commit is contained in:
Matthew Fritze
2017-05-17 18:50:28 +00:00
committed by android-build-merger
parent 020dd7b169 4bd0f411ce
commit af054e63e0
3 changed files with 69 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/system/SystemDashboardFragment.java
View File

@@ -37,6 +37,8 @@ public class SystemDashboardFragment extends DashboardFragment {
private static final String TAG = "SystemDashboardFrag";
private static final String KEY_RESET = "reset_dashboard";
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_SYSTEM_CATEGORY;
@@ -82,5 +84,14 @@ public class SystemDashboardFragment extends DashboardFragment {
public List<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
keys.add((new BackupSettingsActivityPreferenceController(context)
.getPreferenceKey()));
keys.add(KEY_RESET);
return keys;
}
};
}