Add Modver to Settings.

Change-Id: I596064a80210517ff0dae30401f71b52adabd614

Rename modversion

Change-Id: I6557d5aa68a3ad00166cdd2b8951f425ad7800df

Conflicts:
	res/values/strings.xml
Added build date (ro.build.date from build.prop) to device info.

Change-Id: I5e19ee04de5c26822e171d4af8f4bfc052be9b74

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java
Add the themes configuration entry point

Change-Id: I0eb669956d9e89bb92cd43487b14b4246454a400

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml
Bring in Profiles support from mr0

Change-Id: Icae838838ce2c34aec22c50f166b957205db8394

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
Add LED configuration support from mr0/10.0

Change-Id: I36cee9cc813bd0fc62c30c6e10c61bcd9a131bf6

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
Forward port Quiet Hours settings

Change-Id: I57ad089a2b2f7d6ed3df773ca69ad67f7b8fe185

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SoundSettings.java
Forward port miscelaneous audio features

This commit adds:
 - Ascending ringtone (maniac103)
 - Silent mode
 - Volume panel style (ptunstall)
 - Link volumes

Change-Id: I21742ab94e45407111794b5868d9b4f14d7488da

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/RingerVolumePreference.java
	src/com/android/settings/SoundSettings.java
Settings: add Advanced menu for device-specific settings app

Change-Id: Ib022a224fe71522eb2432a112d2bdf64bc08c926

Conflicts:
	res/values/strings.xml
Settings: Forward port Performance settings

Change-Id: Ib510b35fc2763c6942737afa33873aa5d349a173

Conflicts:
	AndroidManifest.xml
Use holo alert drawable

These instances of the GB icon got missed in the big feature merge.

Change-Id: I4725be79af6e51e1aa5d575a32232bbac0a11275

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/cmstats/AnonymousStats.java
Add preference for enabling root access (3/3)

 * Root over ADB is now disabled by default on non-eng builds
 * Requires support in su binary and adbd
 * Root access can be configured to use ADB only, apps only, or all

Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23

Conflicts:
	res/values/arrays.xml
	src/com/android/settings/DevelopmentSettings.java
Settings: Added cpu info and memory info to About Phone Settings

This is pulled from gingerbread. No code looked like it needed to
be re-done. This contains code from the following two commits.

shafty023<gameboy45@gmail.com>:
http://review.cyanogenmod.com/#change,1774

Keyan Mobli<persiansown@gmail.com>:
http://review.cyanogenmod.com/#change,1820

Patchset 2: Fix string constants
Patchset 3:
- Moved file paths to string constants
- Check for meminfo and cpuinfo files, if bad don't show preference
Patchset 4:
- Created variables for each operation.
- Wrote Long to print -1.
Patchset 5:
- Simplified and refactored
Patchset 6:
- Fix authorship herp derp
Patchset 7:
- Show only total memory, available memory would probably cause users to
  kill apps en masse.

Change-Id: Ib0550a5af515ae3a48481412c5c9c504cd80b743
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:
	Android.mk
	proguard.flags
CellBroadcast: Disable App links on wifi-only devices

PatchSet 2: Remove unnecessary check

Change-Id: I359b5fef2932dfa072b72384edf9ba730a1f71a1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Fix build

Change-Id: I901d626168dca37a6b215f073e4b7d89bd2f6a89
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

Conflicts:
	res/values/strings.xml
	res/xml/development_prefs.xml
Settings: Forward port Kill app back long press

Original author: DaneshM

Change-Id: Ide8be24d679d0b3d74bf56b33696dc279de49470

Conflicts:
	res/values/strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Settings: Forward port missing Profiles related changes

Change-Id: I3cda345208171c5b45daf2d5d263017bc538bd48

Conflicts:
	src/com/android/settings/Settings.java
Apn settings fixes / code maintainence

Depends on : http://review.cyanogenmod.com/#change,13743

Cleanup unecessary resources and use global ones
  - This fixes the duplicate id issue currently causing apn's to be un-editable

Bring the ui aspect of the preference up to speed with ics
 - Use ics highlight / layout...etc
 - Use fragments

Patchset 5 : Remove theme for ApnEditor
             Use static access for variables
Patchset 6 : Launch apn editor internally as a fragment
	     Replace deprecated managedQuery with CursorLoader

Change-Id: I069415b29846f30665ce76e52f04115d1b65e455

Conflicts:

	AndroidManifest.xml

Conflicts:
	AndroidManifest.xml
	res/layout/apn_preference_layout.xml
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ApnSettings.java

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ApnSettings.java
	src/com/android/settings/Settings.java
Settings: Forward port CM Screen Security settings (Part 1 of 2)

includes:
- Menu Unlock, Quick Unlock, Home unlock and Slide lock delay settings
  Author: DvTonder

- Lockscreen cleanup: Rework the logic to separate cm lockscreen
  settings from stock lockscreen settings.
  Author: Danesh M
  Id: Ic3eebc30fbb55afa6254889b17bde6e3083d1847

- Fix unknown sources crash
  Modify logic to only make cmsecurity specify the extra,
  any other time, default to stock security
  Author: Danesh M
  Id: Ida4b8ccc2f41d79aa9013029b4245ae4d3cd4496

- Adjust available options based on screen lock picked
  Disable / enable the available screen security aditional options based
  on what screen lock was picked.
  Author: jfassad
  Id: I634b18b58d0e1a1c075f9808776fc4f685316221

- Add home button unlock option
  Author: invisiblek
  Id: I10b96b2f788ca26bc45f1758e612b9dfe7beff59

Change-Id: I0dda524830d8dce571910eb1fbd66d5b5af11bff

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/app_restrictions.xml
	src/com/android/settings/SecuritySettings.java