diff options
author | Lifu Tang <lifu@google.com> | 2015-03-23 13:16:56 -0700 |
---|---|---|
committer | Lifu Tang <lifu@google.com> | 2015-03-23 15:55:10 -0700 |
commit | cb193d55e17fc7cfdb195eea9b6c4b4c7af66b4b (patch) | |
tree | 6c0a26d8ff169e95b07b4ee2edc0f0a677acc066 /src/com/android/settings/location | |
parent | 584b2b2bc17a4ccf42952b188722de1091c101be (diff) | |
download | packages_apps_Settings-cb193d55e17fc7cfdb195eea9b6c4b4c7af66b4b.zip packages_apps_Settings-cb193d55e17fc7cfdb195eea9b6c4b4c7af66b4b.tar.gz packages_apps_Settings-cb193d55e17fc7cfdb195eea9b6c4b4c7af66b4b.tar.bz2 |
Added a screen to configure wireless scanning
- Created "Scanning" preference screen
- Added overflow menu on "Location" settings to access "Scanning" settings
- Moved "Wi-Fi scanning always available" from Wi-Fi settings to "Scanning"
settings
- Added "Bluetooth scanning always available" preference (UI only)
Change-Id: I85d8cd60ab309db5db9caee43f4b5a117192d904
Diffstat (limited to 'src/com/android/settings/location')
-rw-r--r-- | src/com/android/settings/location/LocationSettings.java | 27 | ||||
-rw-r--r-- | src/com/android/settings/location/ScanningSettings.java | 69 |
2 files changed, 96 insertions, 0 deletions
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 1ed2ece..d66f91c 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -29,6 +29,9 @@ import android.preference.PreferenceCategory; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; import android.util.Log; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.widget.Switch; import com.android.settings.R; @@ -66,6 +69,8 @@ public class LocationSettings extends LocationSettingsBase /** Key for preference category "Location services" */ private static final String KEY_LOCATION_SERVICES = "location_services"; + private static final int MENU_SCANNING = Menu.FIRST; + private SwitchBar mSwitchBar; private Switch mSwitch; private boolean mValidListener = false; @@ -250,6 +255,28 @@ public class LocationSettings extends LocationSettingsBase } @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + menu.add(0, MENU_SCANNING, 0, R.string.location_menu_scanning); + // The super class adds "Help & Feedback" menu item. + super.onCreateOptionsMenu(menu, inflater); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + final SettingsActivity activity = (SettingsActivity) getActivity(); + switch (item.getItemId()) { + case MENU_SCANNING: + activity.startPreferencePanel( + ScanningSettings.class.getName(), null, + R.string.location_scanning_screen_title, null, LocationSettings.this, + 0); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + @Override public int getHelpResource() { return R.string.help_url_location_access; } diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java new file mode 100644 index 0000000..364ad7b --- /dev/null +++ b/src/com/android/settings/location/ScanningSettings.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.location; + +import android.preference.Preference; +import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; +import android.provider.Settings.Global; + +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + +/** + * A page that configures the background scanning settings for Wi-Fi and Bluetooth. + */ +public class ScanningSettings extends SettingsPreferenceFragment { + private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning"; + + @Override + public void onResume() { + super.onResume(); + createPreferenceHierarchy(); + } + + private PreferenceScreen createPreferenceHierarchy() { + PreferenceScreen root = getPreferenceScreen(); + if (root != null) { + root.removeAll(); + } + addPreferencesFromResource(R.xml.location_scanning); + root = getPreferenceScreen(); + initPreferences(); + return root; + } + + private void initPreferences() { + SwitchPreference scanAlwaysAvailable = + (SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE); + scanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(), + Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1); + } + + @Override + public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) { + String key = preference.getKey(); + if (KEY_WIFI_SCAN_ALWAYS_AVAILABLE.equals(key)) { + Global.putInt(getContentResolver(), + Global.WIFI_SCAN_ALWAYS_AVAILABLE, + ((SwitchPreference) preference).isChecked() ? 1 : 0); + } else { + return super.onPreferenceTreeClick(screen, preference); + } + return true; + } +} |