commit a94c8183303c2654b5a60529594a3444c26a5176
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 10 03:40:39 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 10 03:40:40 2017 +0000
tree 77ce4e4bd56f23af6813e6dee67b75dd12f5f6a0
parent 1f5fdab61ee0c343cd2ad06ad872d23efcf25b0b
parent 1c1d11002d5e19df12893a6220e0f69b0b560267

Merge "Fix misc style issue in "Open by default" screen."

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

diff --git a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
index a36c98b..ec948e0 100644
--- a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
+++ b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
@@ -48,7 +48,6 @@
     }
 
     private void init() {
-        setIcon(R.drawable.ic_settings_bluetooth);
         setEmptyTextRes(R.string.bluetooth_no_devices_found);
     }
 }

src/com/android/settings/search2/SearchFeatureProviderImpl.java

diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
index b161686..cd9c470 100644
--- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
@@ -40,7 +40,7 @@
 
     @Override
     public boolean isEnabled(Context context) {
-        return false;
+        return true;
     }
 
     @Override