FX: NavRing fix longpress derp.

Change-Id: Icebb34612b65ff30e427f237780b366f94a9b24e
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
FW: Ribbon Fix flakey autohide.

Change-Id: I619b47b2bfc87e189333ad386c8a61ca60758ed9
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/aokp/AokpSwipeRibbon.java
FW: Ribbon Dont unlock for torch.

Change-Id: I4f9d02911f565040034033e87510c559332d0a2d
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:
	core/java/com/android/internal/util/aokp/RibbonTarget.java