Add Modver to Settings.

Change-Id: I596064a80210517ff0dae30401f71b52adabd614

Conflicts:

	src/com/android/settings/DeviceInfoSettings.java

Conflicts:

	res/values/strings.xml
Enable low battery alert sound toggle.

Whenever the battery reaches a low level (<15%), a low battery popup is displayed along with
an associated (and quite annoying) sound.  Framework already has POWER_SOUNDS_ENABLED built-in
as it is, but for whatever reason a toggle was never added.  This patch adds that toggle
in Settings > Sounds.  The default value remains on.

Change-Id: Id7323b19b7dc6883e18a30e17de5915a5bac65b8

Conflicts:

	res/values/strings.xml
	src/com/android/settings/SoundSettings.java

Conflicts:

	src/com/android/settings/SoundSettings.java

Conflicts:

	src/com/android/settings/SoundSettings.java
Added cpu info and memory info to About Phone Settings page
from cm Change-Id: I635bfcec6c47d98988507c7c57889c6cfebfb38d
Conflicts:

	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I85cdde59235b4a9bb3934e811a8cba5861600e7a

Conflicts:

	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
oc settings
Conflicts:

	AndroidManifest.xml

Conflicts:

	AndroidManifest.xml

Change-Id: I5bbc8ce5b37d7aba1e9a75761bc8f8f5e4c6e6fc
change title
add device specific settings
Conflicts:

	AndroidManifest.xml

Conflicts:

	src/com/android/settings/Settings.java

Change-Id: I048295024066bb3eedfb97fd0782e3d7f820aa2b
Added build date (ro.build.date from build.prop) to device info.
Now with tab/space fixed.

Change-Id: I5e19ee04de5c26822e171d4af8f4bfc052be9b74

Conflicts:

	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

Conflicts:

	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
Removed restore CPU settings on boot depency on media being mounted.

Changed CPUReceiver to use ACTION_BOOT_COMPLETED and added the
broadcast receiver to the manifest.

Change-Id: Id887d5083768a656a832e66c76e5976169dd902b
Conflicts:

	AndroidManifest.xml

Conflicts:

	AndroidManifest.xml
change device options name
properly launch device settings

Signed-off-by: carz2 <carz8500@gmail.com>
fix settings page formatting
Conflicts:

	res/xml/settings_headers.xml

Change-Id: Ib0498f3930a40a1f5f89d0eaceddc47325519200
Allow Notifications and Ringtone volumes to be unlinked. Thanks to http://forum.aokp.co/
 Ported from AOKP. Added code to not affect mutable streams.

Change-Id: Ia4fe1558a436fb8a5c0c930c7c05d7464032a2fc

Conflicts:

	res/values/strings.xml

Conflicts:

	res/values/strings.xml
Volume Settings: fix link mute states checkbox

The test to determine checkbox state was wrong, resulting in
apparent nonpersistence and confusing state.

Change-Id: I163d3518d2c5d4dd4765203e4f694f1f94967c33
fix commit 5032c8d15641018fc6d515403cdd5e7ba47e76c0
low battery sound switch
fix commit c4de20faaaa55008ef151fb692f84a0fd72cb606
Sound Settings - Quiet Hours (Part 1 of 2)

This is the settings part of the Quiet Hours settings, ported from
CM7.

Patch set 4 - Moved the setting to the Sound Settings screen.
Patch set 5 - Make it work in the new location :-)
Patch set 6 - Cleanup of some spacing issues
Patch set 7 - Added Dutch translations
Patch set 8 - Changed commit name

Change-Id: I8a37b4cf9051135248ab9259376b9b023fcc1a6c

Conflicts:

	res/values/strings.xml
	res/xml/profiles_settings.xml
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/cyanogenmod/ProfilesSettings.java
Conflicts:

	res/values-nl/strings.xml
	res/values/strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java

Conflicts:

	src/com/android/settings/SoundSettings.java
statusbar: add settings part
Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	res/xml/settings_headers.xml

Change-Id: Ib2d3765b358bc11a91bb91a901ce65fa185cbd4e
settings for signal text/hidden
Add an option to change the device hostname (2/2).

This adds an option to modify the device hostname used
in ip resolution. This is useful when connecting to the
android device in a dynamic dhcp environment.

Change-Id: Ibc145b74036617248d4f33c6866cc9c8a8cc8974
add statusbar notification count
Conflicts:

	res/values/strings.xml

Change-Id: I994533dc3c78d36eb5b9854cd3556d6f1945649a

Conflicts:

	src/com/android/settings/StatusBarSettings.java