Merge "Fix bluetooth search result no-op" into pi-dev

2018-05-29 19:40:14 +00:00
parent 75b3e6f302 d5fc3a95c6
commit f14bfcbfa6
4 changed files with 76 additions and 9 deletions
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -40,6 +40,8 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment

    private static final String TAG = "AdvancedConnectedDeviceFrag";

+    static final String KEY_BLUETOOTH = "bluetooth_settings";
+
    @Override
    public int getMetricsCategory() {
        return MetricsProto.MetricsEvent.CONNECTION_DEVICE_ADVANCED;
@@ -104,6 +106,9 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
                        keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
                    }

+                    // Parent duplicate
+                    keys.add(KEY_BLUETOOTH);
+
                    return keys;
                }