Swipe Edge Gesture (2/2)

Change-Id: I427cb2137c9ba5f6115ec0457f7f57432c8c95c5

Conflicts:
	res/values/strings.xml
	res/xml/preference_headers.xml
Swip Edge Gesture Translation

Change-Id: I1390a228375f7d1ce2e365745e735eb9a63f7b44