Add back halo effect color
Active display: Add sunlight mode. [2/2]

Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55

Conflicts:
	res/values/strings.xml
Improve Recents menu (2/2)

Credit to andros11 as this is pretty much a kang of his
Clear recents position Settings commit from jb2
Settings: Restore functionality of reset in colour and gamma hardware tunables

Change http://review.cyanogenmod.org/#/c/50147/1 introduced a requirement that the user
manually change slider settings in colour and gamma controls before the values would write
to file, breaking the reset behaviour.

Change-Id: I5049631d2fa2a8d3553e8d56f49dc59770ecd6fb
RC: Toggles vibrate on click (2/2)

PS2: Remove option for non vibrating devices
PS3: Upps

Change-Id: Ieace390a7d6cd010031e04d2c5d9c7d19ead9670
Signed-off-by: kecinzer <kecinzer@gmail.com>
Merge remote-tracking branch 'upstream/jb3' into jb3