Wei Wang 41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." ...

This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

2014-03-19 22:37:27 -07:00

..

accessibility_settings.xml

DO NOT MERGE Remove extra fragment in captioning preferences

2014-03-07 14:06:07 -08:00

account_sync_settings.xml

Account types at toplevel of Settings

2012-06-04 17:01:22 -07:00

add_account_settings.xml

Move Account & sync settings into Settings app.

2010-12-01 15:14:09 -08:00

apn_editor.xml

add MVNO field for APN Editor

2013-02-28 13:20:39 +09:00

apn_settings.xml

…

app_restrictions.xml

Adding UI for editing the name and the picture of a limited user.

2013-04-22 12:12:05 -07:00

application_settings.xml

Refactoring in Settings/Applications

2011-06-22 11:20:48 -07:00

appwidget_info.xml

Increase dimens for power control widget for sw600dp

2012-06-05 14:58:24 -07:00

bluetooth_device_advanced.xml

Fix multiple BT settings bugs.

2011-08-03 17:55:27 -07:00

bluetooth_settings.xml

Settings refactoring

2011-06-21 11:05:29 -07:00

captioning_settings.xml

DO NOT MERGE Add preference for caption text opacity

2014-03-07 14:06:29 -08:00

data_usage_metered_prefs.xml

Better messaging when Wi-Fi disabled.

2012-05-04 10:26:58 -07:00

date_time_prefs.xml

Stop hard-coding sample 12- and 24-hour times.

2012-09-06 14:49:35 -07:00

development_prefs.xml

Remove experimental WebView setting.

2013-10-14 17:35:43 +01:00

device_info_memory.xml

Storage stats on external SD card in Settings.

2011-05-25 12:12:22 -07:00

device_info_settings.xml

Add support to display regulatory info from *#07#.

2013-04-23 13:06:54 -07:00

device_info_status.xml

Add latest area info broadcast to Settings status screen.

2012-12-04 18:18:55 -08:00

device_picker.xml

Fix regression in Bluetooth settings.

2012-09-24 20:33:51 -07:00

display_settings.xml

Update Settings app to use new brightness dialog

2013-02-20 11:03:38 -08:00

file_paths.xml

Fix profile picture picking for restricted profiles

2013-09-10 17:16:12 -07:00

home_selection.xml

Introduce 'Home' settings

2013-09-13 12:50:41 -07:00

input_methods_prefs.xml

…

language_settings.xml

Fix the title of the fragments of the personal dictionary settings

2013-04-30 16:08:00 +09:00

location_mode.xml

Added UI widgets for new location settings page

2013-08-02 16:57:07 -07:00

location_settings.xml

Renamed "App settings" back to "Location services"

2013-10-01 12:29:17 -07:00

manage_accounts_settings.xml

Account types at toplevel of Settings

2012-06-04 17:01:22 -07:00

nfc_payment_settings.xml

NFC payment settings.

2013-08-06 19:16:54 -07:00

power_usage_summary.xml

Use a different wallpaper fragment title from the preference item.

2011-07-25 14:09:57 -07:00

print_job_settings.xml

Add print job settings screen.

2013-09-26 13:58:59 -07:00

print_settings.xml

Add print job settings screen.

2013-09-26 13:58:59 -07:00

privacy_settings.xml

Move the desktop backup pw from "Backup and reset" to "Developer" settings

2011-08-12 17:22:41 -07:00

process_stats_summary.xml

Initial rough stab at a proc stats UI.

2013-08-08 15:01:59 -07:00

quick_launch_settings.xml

…

security_settings_biometric_weak.xml

Add setting to disable keyguard widgets

2013-08-20 19:03:30 -07:00

security_settings_chooser.xml

Add setting to disable keyguard widgets

2013-08-20 19:03:30 -07:00

security_settings_encrypted.xml

Display the correct encryption settings.

2011-01-25 10:29:50 -06:00

security_settings_lockscreen.xml

Add setting to disable keyguard widgets

2013-08-20 19:03:30 -07:00

security_settings_misc.xml

Restriction pin changes.

2013-08-07 14:57:43 -04:00

security_settings_password.xml

Add setting to disable keyguard widgets

2013-08-20 19:03:30 -07:00

security_settings_pattern.xml

Add setting to disable keyguard widgets

2013-08-20 19:03:30 -07:00

security_settings_picker.xml

Fix 5466557: Removed secondary screenlock settings labels

2011-10-17 20:57:17 -04:00

security_settings_pin.xml

Add setting to disable keyguard widgets

2013-08-20 19:03:30 -07:00

security_settings_unencrypted.xml

Display the correct encryption settings.

2011-01-25 10:29:50 -06:00

security_settings.xml

Split Location and Security settings.

2011-06-21 16:53:00 -07:00

settings_headers.xml

Offer to enable a print service after it is installed (Settings).

2013-09-20 17:34:34 -07:00

sim_lock_settings.xml

Disable change PIN when PIN is inactive

2010-12-06 10:21:13 +01:00

sound_settings.xml

added dock audio settings for non bluetooth docks

2012-10-27 13:30:55 -07:00

spellchecker_prefs.xml

[Step 1] Add preference activities for spell checkers

2011-07-25 09:40:36 +09:00

sync_settings.xml

Add back a SYNC_SETTINGS screen

2012-06-06 20:55:40 -07:00

testing_settings.xml

Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40

2010-09-02 18:19:02 -07:00

testing_wifi_settings.xml

…

tether_prefs.xml

Move tether settings help to menu and remove local assets.

2012-04-27 17:38:40 -07:00

timezones.xml

resolved conflicts for merge of 162b014c to klp-dev-plus-aosp

2013-09-24 14:59:11 -07:00

tts_engine_settings.xml

Fix for setting TTS language to recently downloaded one

2012-08-14 08:29:05 -07:00

tts_settings.xml

Disable TTS "Listen to the example" if not supported

2013-08-05 10:55:07 +01:00

usb_settings.xml

USB Settings: Remove AFT installer CD; add help text to MTP and PTP widget summary

2011-08-01 09:53:37 -04:00

user_settings.xml

Add resources for light theme

2013-08-30 10:10:02 -07:00

vpn_settings2.xml

Always-on VPN.

2012-08-26 17:01:46 -07:00

wallpaper_settings.xml

Use a different wallpaper fragment title from the preference item.

2011-07-25 14:09:57 -07:00

wifi_access_points_for_wifi_setup_xl.xml

Settings refactoring

2011-06-21 11:05:29 -07:00

wifi_access_points.xml

Fix regression in Bluetooth settings.

2012-09-24 20:33:51 -07:00

wifi_advanced_settings.xml

Add install support for WIFI UID

2013-03-29 11:40:16 -07:00

wifi_display_settings.xml

First draft of wifi display settings UI.

2012-09-19 21:37:20 -07:00

wifi_p2p_settings.xml

Updated: Wi-Fi p2p initial UI implementation

2011-07-24 11:16:50 -07:00

wifi_settings.xml

Settings refactoring

2011-06-21 11:05:29 -07:00

wireless_settings.xml

Implement new method for handling SMS/MMS on the platform

2013-09-16 13:45:42 -07:00