Stylus gestures (2/3)

Change-Id: I33928f4870b269d540adec9186fd52b7b6d28175

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/gestures_prefs.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java