Reconcile NavRing.java with CM
Revert "settings: quicksettings: allow flip animation on clicking a tile (1/2)"

This reverts commit d16db6caafca57856e03c4d4c4ba35e9b8e63792.

Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>

Conflicts:
	res/values/pixel_strings.xml