revert aicp weather... still needs work

Change-Id: Ia79701fd7ffe5d85ed2112607ad6ed4636a8cd49
Signed-off-by: scott <scott@ubuntu>
Settings: "Vibrate during call" requires VOICE_CAPABLE

Change-Id: I87371b8ef2ab729a57fad07a2fa595c009b4fdfb
Signed-off-by: scott <scott@ubuntu>
cmhw: Use hardware's default value for color enhancement

 * First boot should use the value read from sysfs rather than
   forcing the feature to be enabled.

Change-Id: I42bebb52cbc7ada96faae50b6b27849484985fce
Signed-off-by: scott <scott@ubuntu>
Settings: Create SAR level preference, allow overlay.

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

Conflicts:
	res/values/cm_strings.xml
	res/values/config.xml
Revert "add back halo enable/disable due to popular demand."

This reverts commit e00d1c44528d7c7bf137ecfecf676d0ad9f61cf3.

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

Conflicts:
	res/values/bs_strings.xml
	src/com/android/settings/beanstalk/Halo.java

Change-Id: I4489a6430d8d23c69fc4a8cc35c810d96eb75972
HALO & Reminder: Remove Halo enable icon, add setting (2/2)

Fixes Reminder layout

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

Conflicts:
	res/values/strings_aicp.xml
	res/xml/halo_settings.xml
	src/com/android/settings/beanstalk/Halo.java
enable hover from settings

Change-Id: I4e2e4bb6aaf039ff09678da248d7c56629f9b73a
Signed-off-by: scott <scott@ubuntu>
[1/2] OmniGears: Clock on lockscreen

Allow to enable status bar clock on lockscreen (default off)

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

Conflicts:
	res/values/custom_strings.xml
	src/org/omnirom/omnigears/slim/StatusBarClockStyle.java
Fix upgrade to latest proguard

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

Conflicts:
	proguard.flags
fix up display and animations from earlier reorg

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