Settings: reorder lockscreen interface settings

Change-Id: I4995fe45ef528e71ccff98c53e0d6e813febc762
Merge cm upstream

Change-Id: I5d1068c65506fb95b521e758ac45ce64e38c440c
Make phone status string translatable.

Change-Id: I34499dffde79f842f00a8c581ead26df5475899d
Add dummy strings to prevent aapt warnings

Change-Id: I13e2b603bafd79bec87ee3c3e04ec8e4d5839ac2
Revert "BT: Multi HF support in Settings App."

This reverts commit 7bbd90528064516a4aae200731a7fd60acd09192.

Change-Id: Id95bec6f358c6235f143259c912e818b445e2e0b
Settings: include gradle for easier importing to android studio

do not forget to "sdkgen" before

Change-Id: Ia97ea65135cd4b3377edf92a823f41ac8def1910
[1/2] Settings: add translators section

Change-Id: I2fd7474fcbb5c08f45c89c2743b96f2f96bc19ae
Settings: Remove Wallpaper selection from Display

Let the launcher handle wallpaper selection.

Change-Id: I7f0eb20a5bc01d82fdb98905524b9743fee447c6
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: introduce crazy lab

also expose some more settings when secret mode is enabled

Change-Id: Ie7b4f173632e75768dc173460a9d7738f6bad0e3
[2/2] Settings: crazy lab: add force multi pane switch for Settings

Change-Id: I6ec13ec3ef8c8ff2456b2c826edcfd9660a14aa4
Don't show "Eject card" if the card is not accessible

SD card is not accessible without removing the battery on some devices.
Remove the "Eject" options on those devices

Depends on http://review.cyanogenmod.org/62708

Change-Id: Iddfa72314f7c96579ddd98e8fb312236348b7c2d
Settings: remove screen-off animation checkbox

Instead of having a separate checkbox on whether to
enable an animation, let's collapse it into the listview
preference. Now the user is presented with 3 options:

* Disabled
* Electron beam
* Fade out

Change-Id: I8bdcfbf5eba6b639eecabe22ad9b78b642f636df
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: disable hardware unlock buttons while secure

Disable the unlock home/menu/camera options in settings
while a secure lockscreen is active to signal they do
not work to the user.

Change-Id: I193d253d40c7ceef80c6659b08d02be7159f476d
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: lockscreen wallpaper crash fix

If a user backs out fast enough after setting a
custom wallpaper, the fragment becomes detached
from the activity, so any calls to getActivity()
were throwing exceptions.

The solution is to use the application Context
for toassts to still inform the user of the
status, and not update any UI elements
after the fragment is no longer attached.

Change-Id: Ia9f61184fb484d3af25565bc3c56e8b7b63ff4eb
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: expose new theme engine to those who know

Change-Id: I8999c542596c8dafefad5f66a86b9bd6f31ec5f4
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4

Solved conflicts:
	res/values/custom_strings.xml

	modified:   .gitignore
	modified:   Android.mk
	modified:   AndroidManifest.xml
	new file:   build.gradle
	new file:   gradle/wrapper/gradle-wrapper.jar
	new file:   gradle/wrapper/gradle-wrapper.properties
	new file:   res/drawable-hdpi/ic_settings_secret.png
	new file:   res/drawable-mdpi/ic_settings_secret.png
	new file:   res/drawable-xhdpi/ic_settings_secret.png
	new file:   res/drawable-xxhdpi/ic_settings_secret.png
	modified:   res/layout/dev_card.xml
	new file:   res/layout/fragment_about_nameless_translators.xml
	new file:   res/layout/widget_tv_seperator.xml
	modified:   res/values-af/arrays.xml
	modified:   res/values-af/cm_arrays.xml
	new file:   res/values-af/cm_caf.xml
	new file:   res/values-af/cm_plurals.xml
	modified:   res/values-af/cm_strings.xml
	modified:   res/values-af/strings.xml
	modified:   res/values-am/arrays.xml
	modified:   res/values-ar/arrays.xml
	modified:   res/values-be/arrays.xml
	modified:   res/values-bg/arrays.xml
	modified:   res/values-ca/arrays.xml
	modified:   res/values-ca/cm_arrays.xml
	new file:   res/values-ca/cm_caf.xml
	new file:   res/values-ca/cm_plurals.xml
	modified:   res/values-ca/cm_strings.xml
	modified:   res/values-ca/strings.xml
	modified:   res/values-cs/arrays.xml
	new file:   res/values-cs/cm_aosp.xml
	modified:   res/values-cs/cm_arrays.xml
	new file:   res/values-cs/cm_caf.xml
	modified:   res/values-cs/cm_plurals.xml
	modified:   res/values-cs/cm_strings.xml
	modified:   res/values-cs/strings.xml
	modified:   res/values-da/arrays.xml
	modified:   res/values-da/cm_arrays.xml
	new file:   res/values-da/cm_caf.xml
	renamed:    res/values-lt/cm_plurals.xml -> res/values-da/cm_plurals.xml
	modified:   res/values-da/cm_strings.xml
	modified:   res/values-da/strings.xml
	modified:   res/values-de/arrays.xml
	new file:   res/values-de/cm_aosp.xml
	modified:   res/values-de/cm_arrays.xml
	new file:   res/values-de/cm_caf.xml
	modified:   res/values-de/cm_plurals.xml
	modified:   res/values-de/cm_strings.xml
	modified:   res/values-de/custom_strings.xml
	modified:   res/values-de/strings.xml
	modified:   res/values-el/arrays.xml
	new file:   res/values-el/cm_aosp.xml
	modified:   res/values-el/cm_arrays.xml
	new file:   res/values-el/cm_caf.xml
	new file:   res/values-el/cm_plurals.xml
	modified:   res/values-el/cm_strings.xml
	modified:   res/values-el/strings.xml
	modified:   res/values-en-rGB/arrays.xml
	modified:   res/values-en-rGB/cm_strings.xml
	modified:   res/values-es-rUS/arrays.xml
	modified:   res/values-es-rXA/cm_arrays.xml
	new file:   res/values-es-rXA/cm_caf.xml
	modified:   res/values-es-rXA/cm_plurals.xml
	modified:   res/values-es-rXA/cm_strings.xml
	new file:   res/values-es-rXA/strings.xml
	modified:   res/values-es/arrays.xml
	new file:   res/values-es/cm_aosp.xml
	new file:   res/values-es/cm_arrays.xml
	new file:   res/values-es/cm_caf.xml
	new file:   res/values-es/cm_plurals.xml
	renamed:    res/values-es/cm_translations.xml -> res/values-es/cm_strings.xml
	modified:   res/values-es/strings.xml
	modified:   res/values-et/arrays.xml
	modified:   res/values-fa/arrays.xml
	modified:   res/values-fi/arrays.xml
	new file:   res/values-fi/cm_arrays.xml
	new file:   res/values-fi/cm_caf.xml
	new file:   res/values-fi/cm_plurals.xml
	new file:   res/values-fi/cm_strings.xml
	modified:   res/values-fi/strings.xml
	modified:   res/values-fr/arrays.xml
	modified:   res/values-fr/cm_arrays.xml
	new file:   res/values-fr/cm_caf.xml
	modified:   res/values-fr/cm_plurals.xml
	modified:   res/values-fr/cm_strings.xml
	modified:   res/values-fr/custom_strings.xml
	modified:   res/values-fr/strings.xml
	modified:   res/values-hi/arrays.xml
	modified:   res/values-hr/arrays.xml
	modified:   res/values-hu/arrays.xml
	modified:   res/values-hu/cm_arrays.xml
	new file:   res/values-hu/cm_caf.xml
	modified:   res/values-hu/cm_plurals.xml
	modified:   res/values-hu/cm_strings.xml
	modified:   res/values-hu/strings.xml
	modified:   res/values-in/arrays.xml
	modified:   res/values-it/arrays.xml
	new file:   res/values-it/cm_aosp.xml
	modified:   res/values-it/cm_arrays.xml
	new file:   res/values-it/cm_caf.xml
	modified:   res/values-it/cm_plurals.xml
	modified:   res/values-it/cm_strings.xml
	modified:   res/values-it/strings.xml
	modified:   res/values-iw/arrays.xml
	new file:   res/values-iw/cm_arrays.xml
	new file:   res/values-iw/cm_caf.xml
	new file:   res/values-iw/cm_plurals.xml
	modified:   res/values-iw/cm_strings.xml
	modified:   res/values-iw/strings.xml
	modified:   res/values-ja/arrays.xml
	new file:   res/values-ja/cm_arrays.xml
	renamed:    res/values-tr/cm_plurals.xml -> res/values-ja/cm_plurals.xml
	new file:   res/values-ja/cm_strings.xml
	modified:   res/values-ja/strings.xml
	modified:   res/values-ko/arrays.xml
	modified:   res/values-lt/arrays.xml
	modified:   res/values-lt/strings.xml
	modified:   res/values-lv/arrays.xml
	modified:   res/values-ms/arrays.xml
	modified:   res/values-nb/arrays.xml
	modified:   res/values-nl/arrays.xml
	modified:   res/values-nl/cm_arrays.xml
	new file:   res/values-nl/cm_caf.xml
	modified:   res/values-nl/cm_plurals.xml
	modified:   res/values-nl/cm_strings.xml
	modified:   res/values-nl/strings.xml
	modified:   res/values-pl/arrays.xml
	modified:   res/values-pl/cm_arrays.xml
	new file:   res/values-pl/cm_caf.xml
	modified:   res/values-pl/cm_plurals.xml
	modified:   res/values-pl/cm_strings.xml
	modified:   res/values-pl/strings.xml
	new file:   res/values-pt-rBR/cm_aosp.xml
	new file:   res/values-pt-rBR/cm_arrays.xml
	new file:   res/values-pt-rBR/cm_caf.xml
	new file:   res/values-pt-rBR/cm_plurals.xml
	new file:   res/values-pt-rBR/cm_strings.xml
	modified:   res/values-pt-rPT/arrays.xml
	new file:   res/values-pt-rPT/cm_arrays.xml
	new file:   res/values-pt-rPT/cm_caf.xml
	new file:   res/values-pt-rPT/cm_plurals.xml
	new file:   res/values-pt-rPT/cm_strings.xml
	modified:   res/values-pt-rPT/strings.xml
	modified:   res/values-pt/arrays.xml
	deleted:    res/values-pt/cm_arrays.xml
	deleted:    res/values-pt/cm_plurals.xml
	deleted:    res/values-pt/cm_strings.xml
	modified:   res/values-ro/arrays.xml
	modified:   res/values-ru/arrays.xml
	modified:   res/values-ru/cm_arrays.xml
	new file:   res/values-ru/cm_caf.xml
	new file:   res/values-ru/cm_plurals.xml
	modified:   res/values-ru/cm_strings.xml
	modified:   res/values-ru/strings.xml
	modified:   res/values-sk/arrays.xml
	new file:   res/values-sk/cm_arrays.xml
	new file:   res/values-sk/cm_caf.xml
	new file:   res/values-sk/cm_plurals.xml
	new file:   res/values-sk/cm_strings.xml
	modified:   res/values-sk/strings.xml
	modified:   res/values-sl/arrays.xml
	modified:   res/values-sr/arrays.xml
	modified:   res/values-sv/arrays.xml
	modified:   res/values-sw/arrays.xml
	new file:   res/values-ta/cm_plurals.xml
	new file:   res/values-ta/cm_strings.xml
	modified:   res/values-th/arrays.xml
	deleted:    res/values-th/cm_arrays.xml
	modified:   res/values-tl/arrays.xml
	modified:   res/values-tr/arrays.xml
	modified:   res/values-tr/cm_arrays.xml
	new file:   res/values-tr/cm_caf.xml
	modified:   res/values-tr/cm_strings.xml
	modified:   res/values-tr/strings.xml
	new file:   res/values-ug-nokeys/strings.xml
	new file:   res/values-ug/arrays.xml
	new file:   res/values-ug/strings.xml
	modified:   res/values-uk/arrays.xml
	modified:   res/values-vi/arrays.xml
	modified:   res/values-zh-rCN/arrays.xml
	modified:   res/values-zh-rCN/cm_arrays.xml
	new file:   res/values-zh-rCN/cm_plurals.xml
	modified:   res/values-zh-rCN/cm_strings.xml
	modified:   res/values-zh-rCN/strings.xml
	modified:   res/values-zh-rTW/arrays.xml
	new file:   res/values-zh-rTW/cm_arrays.xml
	new file:   res/values-zh-rTW/cm_plurals.xml
	new file:   res/values-zh-rTW/cm_strings.xml
	modified:   res/values-zh-rTW/strings.xml
	modified:   res/values-zu/arrays.xml
	modified:   res/values/attrs.xml
	modified:   res/values/cm_arrays.xml
	new file:   res/values/cm_extra.xml
	modified:   res/values/cm_plurals.xml
	modified:   res/values/cm_strings.xml
	modified:   res/values/custom_arrays.xml
	modified:   res/values/custom_attrs.xml
	modified:   res/values/custom_strings.xml
	new file:   res/values/custom_translators.xml
	modified:   res/values/strings.xml
	new file:   res/xml-ug/timezones.xml
	modified:   res/xml/device_info_settings.xml
	modified:   res/xml/display_settings.xml
	modified:   res/xml/lockscreen_interface_settings.xml
	new file:   res/xml/nameless_secret_settings.xml
	modified:   res/xml/security_settings_whisperpush.xml
	modified:   res/xml/settings_headers.xml
	new file:   settings.gradle
	modified:   src/com/android/settings/DisplaySettings.java
	modified:   src/com/android/settings/Settings.java
	modified:   src/com/android/settings/SoundSettings.java
	deleted:    src/com/android/settings/WallpaperTypeSettings.java
	modified:   src/com/android/settings/bluetooth/HeadsetProfile.java
	modified:   src/com/android/settings/cyanogenmod/LockscreenButtons.java
	modified:   src/com/android/settings/cyanogenmod/LockscreenInterface.java
	modified:   src/com/android/settings/deviceinfo/Status.java
	modified:   src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
	modified:   src/com/android/settings/nameless/about/AboutCrewFragment.java
	modified:   src/com/android/settings/nameless/about/AboutMaintainersFragment.java
	new file:   src/com/android/settings/nameless/about/AboutTranslatorsFragment.java
	new file:   src/com/android/settings/nameless/secret/CrazyLabSettings.java
	modified:   src/com/android/settings/nameless/utils/Helpers.java
	modified:   src/com/android/settings/nameless/widgets/DeveloperPreference.java