Ken Wakasa 6d5b8951b1 Merge commit '47ad0cf3' into manualmerge ...

Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2

2010-09-30 11:54:31 +09:00

..

accessibility_settings.xml

WebView accessibility support - Adding opt-in setting for enabling accessibility script injection from Google

2010-09-16 12:45:19 -07:00

apn_editor.xml

Add Authentication Type field to the APN settings.

2009-10-26 15:18:23 -07:00

apn_settings.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

application_settings.xml

Improvements to manage apps / running services:

2010-07-28 17:41:08 -07:00

appwidget_info.xml

Adjust widget size.

2009-09-21 09:32:11 -07:00

bluetooth_device_advanced.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

bluetooth_settings.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

date_time_prefs.xml

Add an Automatic Time Zone setting to Date & Time settings.

2010-09-22 11:33:04 -07:00

development_prefs.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

device_info_memory.xml

Add checkbox to enable PTP USB mode.

2010-08-31 14:38:44 -04:00

device_info_settings.xml

Add Safety information to Settings > About Phone

2009-09-26 21:10:38 -07:00

device_info_status.xml

CDMA Settings additions

2009-06-25 22:01:32 -07:00

device_picker.xml

Implement Bluetooth device picker

2009-08-19 20:45:18 -07:00

display_settings.xml

Fix for 2284833 : Remove big brightness icon and make it a small one on the title bar.

2010-02-26 14:09:37 -08:00

dock_settings.xml

Add a checkbox to the Dock settings to control insertion/removal sound effects.

2010-03-04 14:06:06 -05:00

input_methods_prefs.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

keyboard_settings.xml

auto import from //depot/cupcake/@136594

2009-03-05 14:34:39 -08:00

language_settings.xml

Merge commit '47ad0cf3' into manualmerge

2010-09-30 11:54:31 +09:00

manage_accounts_settings.xml

Move ManageAccountsSettings into Settings.

2010-09-17 11:22:02 -07:00

power_usage_summary.xml

Track native processes.

2009-06-25 00:40:50 -07:00

privacy_settings.xml

Refactor settings top level activities to use fragments.

2010-08-18 22:59:33 -07:00

quick_launch_settings.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

security_settings_chooser.xml

Fix 2579923: Make changing lock screen method more discoverable.

2010-04-11 23:28:33 -07:00

security_settings_password.xml

Fix 2579224: Add a separate timeout for lockscreen vs display

2010-09-01 19:53:25 -07:00

security_settings_pattern.xml

Fix 2579224: Add a separate timeout for lockscreen vs display

2010-09-01 19:53:25 -07:00

security_settings_picker.xml

Fix 2579923: Make changing lock screen method more discoverable.

2010-04-11 23:28:33 -07:00

security_settings_pin.xml

Fix 2579224: Add a separate timeout for lockscreen vs display

2010-09-01 19:53:25 -07:00

security_settings.xml

Refactor settings top level activities to use fragments.

2010-08-18 22:59:33 -07:00

settings_headers.xml

Use PreferenceActivity and FragmentBreadCrumbs as they offer the same capabilities now.

2010-09-21 15:48:52 -07:00

sim_lock_settings.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

sound_settings.xml

Conditionally remove settings that aren't required on the tablet.

2010-09-11 14:58:01 -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

Wifi diagnostic app to enable debug and provide information

2009-12-10 15:07:05 -08:00

tether_prefs.xml

Fragmentize BluetoothSettings.

2010-09-13 16:18:05 -07:00

timezones.xml

Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules.

2010-01-08 12:39:44 -08:00

tts_settings.xml

Fixing bugs 2577511 and 2581920.

2010-04-08 16:51:35 -07:00

voice_input_output_settings.xml

Fragmentize VoiceOutputSettings.

2010-09-16 10:37:28 -07:00

vpn_edit.xml

Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.

2009-06-26 14:24:50 +08:00

vpn_settings.xml

Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.

2009-06-26 14:24:50 +08:00

vpn_type.xml

Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.

2009-06-26 14:24:50 +08:00

wifi_access_points_for_wifi_setup_xl.xml

Add modifications which should have been in the change

2010-09-01 19:38:23 -07:00

wifi_access_points.xml

WifiSettings: rename WifiSettings2 to WifiSettings.

2010-02-03 15:56:55 +08:00

wifi_advanced_settings.xml

Add static IP UI

2010-09-14 17:02:21 -07:00

wifi_ap_settings.xml

Allow soft AP settings config before bring up

2010-06-24 12:04:36 -07:00

wifi_settings.xml

Fix Wi-Fi title reference in settings

2010-03-09 13:58:04 -08:00

wireless_settings.xml

resolved conflicts for merge of 1ff9ad3f to master

2010-09-29 12:10:35 -07:00