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 "Settings: Use solid actionbar" into cm-11.0
NFC polling mode (2/3)

Change-Id: Ic46ede10fa91f02ca73daa12aa60098c8a52ceef

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