Elliott Hughes 680c8c8e43 resolved conflicts for merge of 33f86196 to stage-aosp-master ...

Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8

2012-09-06 16:09:04 -07:00

..

accessibility_settings.xml

Updating the checkbox state to match the title.

2012-05-18 18:00:31 -07:00

account_sync_settings.xml

Account types at toplevel of Settings

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

add_account_settings.xml

…

apn_editor.xml

…

apn_settings.xml

…

application_settings.xml

…

appwidget_info.xml

Increase dimens for power control widget for sw600dp

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

bluetooth_device_advanced.xml

…

bluetooth_settings.xml

…

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

Implement issue #6819955: Add button to take bug report.

2012-07-13 16:10:16 -07:00

device_info_memory.xml

…

device_info_settings.xml

am 5d72b272: Merge "Add support for SE Android to the Settings app."

2012-08-08 14:04:11 -07:00

device_info_status.xml

Wimax : 4G settings menu and 4G MAC address.

2011-11-07 17:16:18 -08:00

device_picker.xml

…

display_settings.xml

Pulling screen savers for now. DO NOT MERGE.

2011-11-30 14:32:53 -05:00

dock_settings.xml

…

dream_settings.xml

Pulling screen savers for now. DO NOT MERGE.

2011-11-30 14:32:53 -05:00

input_methods_prefs.xml

…

language_settings.xml

Add setting to redirect vibrator to game controller.

2012-04-13 20:27:45 -07:00

location_settings.xml

Move Google-apps specific location settings to a Google package

2012-07-26 14:28:07 -07:00

manage_accounts_settings.xml

Account types at toplevel of Settings

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

power_usage_summary.xml

…

privacy_settings.xml

…

quick_launch_settings.xml

…

security_settings_biometric_weak.xml

Removing head turn and putting blink back

2012-06-08 16:49:29 -04:00

security_settings_chooser.xml

…

security_settings_encrypted.xml

…

security_settings_lockscreen.xml

…

security_settings_misc.xml

…

security_settings_password.xml

Fix 4560303: Add setting to lock later when power button pressed

2012-01-09 14:25:04 -08:00

security_settings_pattern.xml

Fix 4560303: Add setting to lock later when power button pressed

2012-01-09 14:25:04 -08:00

security_settings_picker.xml

…

security_settings_pin.xml

Fix 4560303: Add setting to lock later when power button pressed

2012-01-09 14:25:04 -08:00

security_settings_unencrypted.xml

…

security_settings.xml

…

settings_headers.xml

Account types at toplevel of Settings

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

sim_lock_settings.xml

…

sound_settings.xml

No more silent-mode tristate in Sound Settings.

2012-05-16 13:55:44 -07:00

spellchecker_prefs.xml

…

sync_settings.xml

Add back a SYNC_SETTINGS screen

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

testing_settings.xml

…

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

…

tts_engine_settings.xml

…

tts_settings.xml

…

usb_settings.xml

…

user_details.xml

User management screens

2012-03-27 12:06:29 -07:00

user_settings.xml

User management screens

2012-03-27 12:06:29 -07:00

vpn_settings2.xml

…

wallpaper_settings.xml

…

wifi_access_points_for_wifi_setup_xl.xml

…

wifi_access_points.xml

…

wifi_advanced_settings.xml

Fix poor network detection setting

2012-05-31 11:15:41 -07:00

wifi_p2p_settings.xml

…

wifi_settings.xml

…

wireless_settings.xml

Add menu item to Settings to go to Cell Broadcast settings.

2012-06-25 13:20:45 -07:00