Settings : Add preference for proximity wake

Conflicts:

	res/values/mahdi_strings.xml
	src/com/android/settings/DisplaySettings.java
(2/2) Animation control: remove keyboard animations

Conflicts:

	res/values-de/mahdi_strings.xml
	res/values-el/mahdi_strings.xml
	res/values-hu/mahdi_strings.xml
	res/values-it/mahdi_strings.xml
	res/values-ru/mahdi_strings.xml
	res/values/mahdi_strings.xml
	res/xml/animation_interface_settings.xml
Schism it all

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>
Highlight all search matches for the given constraint.

Change-Id: I9f1a58ee3e6cd59522c4705bedb1457473201d3c