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

Merge "Add keywords for search terms" into pi-dev am: dd0e23b987

Browse Source 
am: 49a3169cb4

Change-Id: I16065c59992f75fc9e45be4bd4b313a0691b13be
This commit is contained in:
Matthew Fritze
2018-03-23 21:55:14 +00:00
committed by android-build-merger
parent 09ddd4d650 49a3169cb4
commit 3f0122fa05
12 changed files with 81 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/DisplaySettings.java
View File

@@ -124,7 +124,6 @@ public class DisplaySettings extends DashboardFragment {
List<String> keys = super.getNonIndexableKeys(context);
keys.add(KEY_DISPLAY_SIZE);
keys.add(WallpaperPreferenceController.KEY_WALLPAPER);
keys.add(KEY_AMBIENT_DISPLAY);
keys.add(KEY_NIGHT_DISPLAY);
return keys;
}

1
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -434,6 +434,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I
data.title = res.getString(R.string.bluetooth_settings);
data.screenTitle = res.getString(R.string.bluetooth_settings);
data.key = DATA_KEY_REFERENCE;
data.keywords = res.getString(R.string.keywords_bluetooth_settings);
result.add(data);
// Removed paired bluetooth device indexing. See BluetoothSettingsObsolete.java.

1
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -571,6 +571,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
data.title = context.getString(R.string.storage_settings);
data.key = "storage_settings";
data.screenTitle = context.getString(R.string.storage_settings);
data.keywords = context.getString(R.string.keywords_storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);

1
src/com/android/settings/wallpaper/WallpaperTypeSettings.java
View File

@@ -118,6 +118,7 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements
data.intentAction = Intent.ACTION_SET_WALLPAPER;
data.intentTargetPackage = info.activityInfo.packageName;
data.intentTargetClass = info.activityInfo.name;
data.keywords = context.getString(R.string.keywords_wallpaper);
result.add(data);
}