Longpress navring disable fix

Derp... with this if the long press is off the behavoir is like stock.

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

Conflicts:

	core/java/android/provider/Settings.java