settings: incall proximity sensor enabled (2/4)

Change-Id: I818a5f42010b5e2f7ab0a593b599792f1ba06c01
Display: Default SRE to off

Facemelt mode is catching people by surprise and being interpreted
as "messed up colors". Default it to off so people can at least see
it kick in as a reaction to enablement

Change-Id: I5816e528363f508fc360c321c702a59f0bb79846
Automatic translation import

Change-Id: Ie92d2963e2fca27455c2c9608d366a082aaaf8ac
Fix NPE if high touch sensitivity is not supported.

Change-Id: Ic51edf500e4c89102beb52b8d69f1066d2406a42
JIRA: BUGDUMP-16237
settings: check if ime switcher pref was remove previously

This could happend in tablet devices

JIRA: BUGDUMP-20712
https://jira.cyanogenmod.org/browse/BUGDUMP-20712
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: I85c1d6e56f85e3220311aabc68d6532d6ffdf59f
quiethours: refresh TimeRangePreference preference on resume

JIRA: CYAN-5223
https://jira.cyanogenmod.org/browse/CYAN-5223
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: Ia06a21aad36e757c0ed89ac81305f9b531f811fd
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into kk_mkt

Conflicts:
	res/values-it/cm_strings.xml

Change-Id: I27338b17b1aa7a1b547b07131ac6e79b5a861947
Revert "settings: incall proximity sensor enabled (2/4)"

This reverts commit 0514b237edc7ea9cf71c7c45a9994d07dac3a6e9.

Change-Id: I82bfd86306846163049d124702a2fc4559a21936
Revert "Revert "settings: incall proximity sensor enabled (2/4)""

This reverts commit fe2bcf0e8b6aa3ac9313995f2c886c4820687703.

Change-Id: I797bcc89471e04c1f999bf4ca22d372d6924f675
Merge pull request #6 from MoKee/kk_mkt

Merge branch 'cm-11.0' into kk_mkt