Clean up
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Add moar timeout/redisplay values
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Status and nav bar customization (2/2)

- Status bar transparency
- Status bar colors
- Status bar transparency mode
- Nav bar (enable/disable)
- Nav bar dimensions (height, height in landscape and width)
- Nav bar background (color, transparency and transparency mode)
- Several changes in SystemSettings.java, by me, to enable navigation bar in devices with hardware buttons and also show all expanded desktop options

Change-Id: Iafccd6cb0a1bbd4b2d8e0d53f495cf8464722a65
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	AndroidManifest.xml
	res/values/cmx_arrays.xml
	res/values/cmx_strings.xml
	res/xml/status_bar.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
Revert "Status and nav bar customization (2/2)"

This reverts commit 974e2ea5b59998ca21399154049adc3e79053efb.
Custom Carrier Label (2/2)

Change-Id: Ib9af0419bfcbe9285ecc47770fb0504518d1d344
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/cmx_strings.xml
	src/com/android/settings/DisplaySettings.java
Customizable Low battery pop-up warning (2/2)

Change-Id: I86d3b348cbabec3f34b047589d7f0a03b069cfae
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/cmx_arrays.xml
	res/values/cmx_strings.xml
Derp
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Move things around to hopefully fix FC
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
settings: Deprecate has_led_flash, move to framework.

 * We need this to configure default tiles in SystemUI so move it.
 * Leave the old one in place so we don't kill every device.

Change-Id: I883f9595f74ab52c8c8152e0105400aaefff4afe
Settings: HU translation

PS2: Manual rebase

Change-Id: I9cb91215a866b4c3ab6e585b94fb5c099a3db131
OCD
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Settings: add Advanced Settings under Display

For use in TV-Out settings and mDNIe

Change-Id: Ib595b81a11e19f8526e532400e57f5771db09499
Add support for the new Remote Display APIs.

Remote display devices will now show up under wireless displays.

Change-Id: I1e73a208fe092a697c8294b743b0f1e2c0eabf42
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Settings into halo
Merge branch 'jb-mr2' into halo
Status and nav bar customization (2/2)

- Status bar transparency
- Status bar colors
- Status bar transparency mode
- Nav bar (enable/disable)
- Nav bar dimensions (height, height in landscape and width)
- Nav bar background (color, transparency and transparency mode)
- Several changes in SystemSettings.java, by me, to enable navigation bar in devices with hardware buttons and also show all expanded desktop options

Change-Id: Iafccd6cb0a1bbd4b2d8e0d53f495cf8464722a65
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	AndroidManifest.xml
	res/values/cmx_arrays.xml
	res/values/cmx_strings.xml
	res/xml/status_bar.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
Add color picker
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Settings: EL translations

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ib59dcff285178a6cbdd5d0b82773fbb4cee6e737
Merge "Settings: add Advanced Settings under Display" into cm-10.2
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Settings into halo