Settings: Quiet Hours System Sounds (2/2)

Change-Id: If5df8bf5e3a1d201ade5f317c49b1c877cd499d9

Conflicts:
	res/values/bs_strings.xml
Properly check devices for proximity sensor

Change-Id: Id6a011b8a51e0db7369b0bab5d67927aa2899e6d

Conflicts:
	src/com/android/settings/ose/LockscreenNotifications.java

Conflicts:
	src/com/android/settings/beanstalk/LockscreenNotifications.java
Settings: allow device trees to invoke custom display settings

in this case gesture control settings.

Intent used: com.slim.action.LAUNCH_SCREEN_OFF_GESTURE_SETTINGS

Change-Id: I82f5a8a4075f109419b08014ad2d723bf2f54402

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values/bs_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
[2/2] settings: Add Haptic Feedback to quicktiles
Credit: @cristianomatos

Change-Id: Ie0c2f12bda44967d063a2042926c7ab23e113750

Conflicts:
	res/values/bs_strings.xml
	res/xml/notification_drawer_qs_settings.xml
Port OnClick Fliptile animation. (2/2)

credits to: TeamBAMF for the original work.

Change-Id: Ie24f6917fab27b5215660f0b0aaa5427aa5b6d1e

Conflicts:
	res/values/dokdo_strings.xml
	res/xml/quick_settings_panel.xml

Conflicts:
	res/values/ose_strings.xml
	src/com/android/settings/beanstalk/NotificationDrawerQsSettings.java