Revert "Revert "Make maximize lockscreen widget more clear.""

This reverts commit edf6a21cb2ef467873bf2cbd5b304c5db67c8e85.
Revert "Fix CustomToggle Actions as well."

This reverts commit fb362b4321723c9d3ced7c14cf9c2d794332a8e7.
Revert "RC: Ribbon seperate the swipe ribbons."

This reverts commit e66af51c811a2d3f87e22e2e7dfe201cb681d835.

Conflicts:
	res/values/strings.xml
Revert "RC: Ribbons Colorize Action Icons"

This reverts commit 67422e5782272a357d27dad8d2b47a59e1ced84b.

Conflicts:
	res/values/strings.xml
Revert "Merge CarbonDev/jb2"

This reverts commit cc79baa4f0010482d6c71c99bef49000da9b280f.
Revert "RC: Ribbons Padding, Click Options, Rearrange Dialog 2/2"

This reverts commit 5b80120cfb523525f7e73895224d546fb958134e.

Conflicts:
	src/com/android/settings/crom/RibbonTargets.java
Revert "RC: "Ribbon options" to "Ribbons""

This reverts commit 571e7757e8f7b27e2a68beae160d36bdbf87670c.

Conflicts:
	res/xml/crom_settings.xml