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

am: 9cb3dd123d Change-Id: Ib35794ec9c9e71c53145f418629287fd72d9adc6
2018-05-29 12:56:44 -07:00
parent 0b5f345e87 9cb3dd123d
commit 58019a84ed
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
@@ -42,6 +42,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;
@@ -106,6 +108,9 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
                        keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
                    }

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