commit 2719da25d8d621a98f58794e34c9afbd56e953d9
author Svetoslav <svetoslavganov@google.com> Fri Apr 11 23:38:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 11 23:38:10 2014 +0000
tree 5998e81155b9b333f6e47eeb32014613444ddca3
parent fa46de5c68f078a595aa61d61ceae6b7951c3aa7
parent caa0b54cbcb71b1124ea50cb0cf5abb6a4d1275f

Merge "Fallback to the default values when indexing from local resource."

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 12d25e5..e336ae4 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -215,8 +215,10 @@
             final Context context = getContext();
 
             SearchIndexableRaw data = new SearchIndexableRaw(context);
+            data.className = BluetoothSettings.class.getName();
             data.title = mCachedDevice.getName();
             data.screenTitle = context.getResources().getString(R.string.bluetooth_settings);
+            data.iconResId = R.drawable.ic_settings_bluetooth2;
             data.enabled = true;
 
             Index.getInstance(context).updateFromSearchIndexableData(data);

src/com/android/settings/bluetooth/DeviceProfilesSettings.java

diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 821013d..b50d2b4 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -235,8 +235,10 @@
             final Context context = preference.getContext();
 
             SearchIndexableRaw data = new SearchIndexableRaw(context);
+            data.className = BluetoothSettings.class.getName();
             data.title = mCachedDevice.getName();
             data.screenTitle = context.getResources().getString(R.string.bluetooth_settings);
+            data.iconResId = R.drawable.ic_settings_bluetooth2;
             data.enabled = false;
 
             Index.getInstance(context).updateFromSearchIndexableData(data);