Torne (Richard Coles) deb0a156bb Resolved conflicts for merge of 67e72aa4 to master ...

Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396

2013-10-15 13:37:35 +01:00

..

accessibility_contrast_settings.xml

Add accessibility display adjustments to Settings

2013-10-02 16:36:33 -07:00

accessibility_daltonizer_settings.xml

Add accessibility display adjustments to Settings

2013-10-02 16:36:33 -07:00

accessibility_inversion_settings.xml

Add accessibility display adjustments to Settings

2013-10-02 16:36:33 -07:00

accessibility_settings.xml

Add accessibility display adjustments to Settings

2013-10-02 16:36:33 -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

…

app_restrictions.xml

…

application_settings.xml

…

appwidget_info.xml

…

bluetooth_device_advanced.xml

…

bluetooth_settings.xml

…

captioning_settings.xml

…

data_usage_metered_prefs.xml

…

date_time_prefs.xml

…

development_prefs.xml

Resolved conflicts for merge of 67e72aa4 to master

2013-10-15 13:37:35 +01:00

device_info_memory.xml

…

device_info_settings.xml

…

device_info_status.xml

…

device_picker.xml

…

display_settings.xml

…

file_paths.xml

…

home_selection.xml

…

input_methods_prefs.xml

…

language_settings.xml

…

location_mode.xml

…

location_settings.xml

Renamed "App settings" back to "Location services"

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

manage_accounts_settings.xml

…

nfc_payment_settings.xml

…

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

…

process_stats_summary.xml

…

quick_launch_settings.xml

…

security_settings_biometric_weak.xml

…

security_settings_chooser.xml

…

security_settings_encrypted.xml

…

security_settings_lockscreen.xml

…

security_settings_misc.xml

…

security_settings_password.xml

…

security_settings_pattern.xml

…

security_settings_picker.xml

…

security_settings_pin.xml

…

security_settings_unencrypted.xml

…

security_settings.xml

…

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

…

sound_settings.xml

…

spellchecker_prefs.xml

…

sync_settings.xml

…

testing_settings.xml

…

testing_wifi_settings.xml

…

tether_prefs.xml

…

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

…

tts_settings.xml

…

usb_settings.xml

…

user_settings.xml

…

vpn_settings2.xml

…

wallpaper_settings.xml

…

wifi_access_points_for_wifi_setup_xl.xml

…

wifi_access_points.xml

…

wifi_advanced_settings.xml

…

wifi_display_settings.xml

…

wifi_p2p_settings.xml

…

wifi_settings.xml

…

wireless_settings.xml

…