Change Regulatory Info Activity to prefer string over image

Change-Id: I9ea5c2bf469af8f654ec4e4bb4f2a8a5738e6a95
Settings: Allow Regulator Information Dialog Title to be overlaid.

  - Remove SAR preference.

Change-Id: I5aead313589f5d5291d20a0388d2d8bc7242b711
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
Settings: Fix "Use actual storage type of sdcard/usb (1/2)."

Fixes http://review.cyanogenmod.org/63744

The original patch used the same string ids for sd in both cm_strings.xml and strings.xml.
Change them so there isn't a clash causing the wrong strings to be displayed by always prefixing the aosp ids with either sd_ or usb_.

Change-Id: Iad509123a9b4b93677b6ec06f15c34d9b0f57165
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
Add support for single color notification LED (2/2)

Change-Id: I4cf21dda3d9e311146149c2ec81fe2398f5f9f87
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/layout/dialog_light_settings.xml
Fix light preference padding

* Based on normal list preference

Change-Id: I2ae4a512ce1f5e6b6613885a755e9d7fbb0ff4c6
Revert "Add support for single color notification LED (2/2)"

This reverts commit c860976e888fb04047f75f61a113e511f13c6d77.
settings: allow scroll in LED settings's color dialog

This is useful in mdpi devices and landscape mode, when the current layout rebased the dialog height

Change-Id: I7f9cd936076d3409e78a8f6b9a24b180a36a2bc8
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Revert "Revert "Add support for single color notification LED (2/2)""

This reverts commit fb6c9c3b37b2312034c7c805fa28562185c3650a.

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/layout/dialog_light_settings.xml

Change-Id: I7e709f91726d45ed4c0a7e7d9e7e4faaed1688a1
fix: Settings FC when WiFi tethering is active

Change-Id: Ifb2ffb1d2d78b57478dc4a2ca003de4ae0fed325
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	src/com/android/settings/wifi/WifiApSettings.java
Modify the Development shortcut help text

Change-Id: I76b2ce8a750a6edd4bfbe968f681ed80f75e8029
Signed-off-by: scott <scott@ubuntu>
Update Bliss Lock Handles

Add new Bliss lockscreen handles.
Derp..
Keep it neat and tidy
Merge remote-tracking branch 'upstream/kk4.4' into kitkat

Conflicts:
	res/drawable/bs_lock.png
	res/drawable/bs_lock_four.png
	res/drawable/bs_lock_three.png
	res/drawable/bs_lock_two.png
	res/values/bs_strings.xml