From 0ac63cdca22950ebad0f9ce82913768486983ac3 Mon Sep 17 00:00:00 2001 From: Lifu Tang Date: Mon, 6 Apr 2015 11:02:51 -0700 Subject: [PATCH] Updated system settings to control BLE scanning Bug: 19966182 Change-Id: Ic3f51957629d785017dd92f7a28f78f20e739559 --- .../android/settings/location/ScanningSettings.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 428701a2947..5eb424de0c8 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -30,6 +30,7 @@ import com.android.settings.SettingsPreferenceFragment; */ public class ScanningSettings extends SettingsPreferenceFragment { private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning"; + private static final String KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE = "bluetooth_always_scanning"; @Override protected int getMetricsCategory() { @@ -54,10 +55,14 @@ public class ScanningSettings extends SettingsPreferenceFragment { } private void initPreferences() { - SwitchPreference scanAlwaysAvailable = + final SwitchPreference wifiScanAlwaysAvailable = (SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE); - scanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(), + wifiScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(), Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1); + final SwitchPreference bleScanAlwaysAvailable = + (SwitchPreference) findPreference(KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE); + bleScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(), + Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1); } @Override @@ -67,6 +72,10 @@ public class ScanningSettings extends SettingsPreferenceFragment { Global.putInt(getContentResolver(), Global.WIFI_SCAN_ALWAYS_AVAILABLE, ((SwitchPreference) preference).isChecked() ? 1 : 0); + } else if (KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE.equals(key)) { + Global.putInt(getContentResolver(), + Global.BLE_SCAN_ALWAYS_AVAILABLE, + ((SwitchPreference) preference).isChecked() ? 1 : 0); } else { return super.onPreferenceTreeClick(screen, preference); }