Settings: add user configurable lockscreen shortcuts (2/2)

Change-Id: I6333792830f7357a9f4fcd5d42c479ec60a71915
(cherry picked from commit baf7177960a3287e12cf607714657333cb600a2e)

Conflicts:
	res/values/slim_strings.xml
Settings: Do not remove quicksettings features on tablets

Old code which were needed to do not conflict with split QS/Notification drawer
on kitkat

just remove the check for it.

Change-Id: I18cd9bf66e10d48f59c9d152129cbf3b1fc074dd
(cherry picked from commit dd37fd4e53365ac04fd38364aa4a67fdaff4bd4f)

Conflicts:
	src/com/android/settings/cmremix/slim/QsSettings.java
Settings: its not an icon anymore...its an option

we moved reset option on dslv into the menu. So the help text is a bit missleading.

Change-Id: Ic502f668432ac76ffda03a9221bd28dabbc889c2
(cherry picked from commit b2bc6eb3190185891680363d0462026c4631315e)

Conflicts:
	res/values/slim_strings.xml
settings: Fix warnings

Change-Id: I51fae71c7c4f820aeee0479d89ab873993c02a7a

(cherry picked from commit a1e5ca59a74b57e36370fd501b56049b6261d8cc)
Settings: Fix blacklist settings crash

Change-Id: Idd261aa9f8e2867312aaaece26150671b177994c

(cherry picked from commit 647340654246a1b310b4264cb7365c55984925b6)
Settings: last app action in long press

Change-Id: I72d9cb5bca5eedd20ea80ee69d370a478e59def4
(cherry picked from commit fe407ed2f3210eb9741245a6f1c9b9890b30ccae)

Conflicts:
	res/values/cm_strings.xml