Forward port Status Bar settings (2/2)

Signal / Clock / Notification Count / Brightness adjustment

Forward port from cm-10.2, adjusted for 4.4

Change-Id: I1632b6454a3fd5240179dfed34b1f332a7a37cda
Make the lock screen camera widget configurable (2/2)

Change-Id: I704ddeb4a1b8ba4537d961334138b6661f8dbc31
Settings: Use solid actionbar

When the action bar is visible, use the solid holo dark theme used
 by the rest of the Settings app

Change-Id: I41deeaa1988d59e121e6e81bcf3f42c570341f0b
Merge "Make the lock screen camera widget configurable (2/2)" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into CyanogenMod-cm-11.0

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

	modified:   res/values/cm_strings.xml
	modified:   res/xml/lockscreen_interface_settings.xml
	modified:   src/com/android/settings/cyanogenmod/LockscreenInterface.java
Update
Merge "Settings: Use solid actionbar" into cm-11.0
Merge pull request #20 from CyanogenMod/cm-11.0

Cm 11.0
Merge "Forward port Status Bar settings (2/2)" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into CyanogenMod-cm-11.0

Conflicts:
	res/values/cm_arrays.xml
	res/xml/status_bar.xml

	modified:   res/xml/status_bar.xml
DeviceInfoSettings: Use ro.cm.display.version instead of ro.cm.version

Follows the same logic as ro.build.display.id/ro.build.id:
engineering, debug and unsigned builds will have no distinction,
user and signed builds will show a simplified version

Change-Id: I713ccb2445ea2e333e831129ef7733fd518282eb
Merge pull request #22 from CyanogenMod/cm-11.0

DeviceInfoSettings: Use ro.cm.display.version instead of ro.cm.version
Merge pull request #1 from cr3pt/cm-11.0

merge from Cr3pT