more configs
	modified:   res/values/config.xml
Added Liquid logo in About Phone
Picky Picky Logo change-up
Added Mod Version
derp
Settings: Add support for variable size pattern lockscreen (Part 2/2)

Thanks CM

for the base.....ported to new keyguard, moved service and some
new API 19 stuff

Change-Id: I016f6cf7688121df5d681d117c35fa8ec2ade497

Conflicts:
	res/values/slim_strings.xml
add Superuser back

Conflicts:
	Android.mk
	proguard.flags

	modified:   Android.mk
	modified:   AndroidManifest.xml
	modified:   proguard.flags
restore superuser settings
	new file:   res/drawable-hdpi/ic_liquid_superuser.png
	new file:   res/drawable-xhdpi/ic_liquid_superuser.png
	modified:   res/values/liquid_strings.xml
	modified:   res/xml/settings_headers.xml

Conflicts:
	res/values/liquid_strings.xml
	res/xml/settings_headers.xml

	new file:   res/drawable-hdpi/ic_liquid_superuser.png
	new file:   res/drawable-xhdpi/ic_liquid_superuser.png
	modified:   res/values/liquid_strings.xml
	modified:   res/xml/settings_headers.xml
fix up last merge, start bringing back settings
	modified:   res/values/liquid_strings.xml
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
	res/values/strings.xml
	src/com/android/settings/DevelopmentSettings.java

Settings: Make CM developer options additions respect the on/off toggle
This commit fixes the problem where, when dev options are turned off, our
CM customizations don't turn off with the rest of the options and the
dangerous option (root access) does not reset to a safe setting.

Change-Id: I879756ea353ce2940c05b224998fc1a945f2ceff

DevSettings: Fix the root-access toggle in eng builds

It was being unconditionally removed, put it back

Change-Id: I8eecab7353c59b224d917cc1710124f57656cf47

Conflicts:
	res/values/strings.xml
Hide Superuser entry if root access for apps is disabled.

Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e

Conflicts:
	src/com/android/settings/Settings.java
Added build date (ro.build.date from build.prop) to device info.

Change-Id: I5e19ee04de5c26822e171d4af8f4bfc052be9b74

Conflicts:
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.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
Add the themes configuration entry point

Change-Id: I0eb669956d9e89bb92cd43487b14b4246454a400

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml

Conflicts:
	res/values/strings.xml
Settings: Fix aapt locale set

This allow to display Settings in other language other than default

Change-Id: Ie0d94a85b6b3f26cad853298b911c7fece0a1247
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
[1/2] Add support for custom LED colors notification

Change-Id: I552351bb002a6800e31bbaea450730e4c7f83bdf
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.

Conflicts:
	res/values/strings.xml

Change-Id: Ibc145b74036617248d4f33c6866cc9c8a8cc8974

Conflicts:
	res/values/cm_strings.xml
	res/xml/development_prefs.xml
Settings : Switch state fix

Since the switch views are shared, we need to recreate them
in order to prevent from being reused as they don't share state.

Change-Id: I4d7038f37883e1791c8c2b0009f0adb85ebb2b88
settings: volume rocker control (wake up and volume) thanks to

CM and omni for the proxy sensor idea

Change-Id: I3dbb8c276fb7c73c8e3ced1624a1ff8e03d9f4ca

Conflicts:
	res/values/slim_strings.xml
Settings: safe headset volume option (2 of 2)

difference to CM and our old implementation added a warning
dialog. A bit extended due that we will have in future other
warning dialogs in soundsettings as well

Change-Id: I6546403484fd773abd9560a8405d75bb682f8b62

Conflicts:
	res/values/slim_strings.xml