Settings: Follow quick launch shortcut renames

Follow the renames of the quick launch shortcuts
introduced in this commit: http://review.cyanogenmod.org/#/c/66271/

Change-Id: Ida3fd795b2d7ff56aff1659b6b43bad9a7d44af1
Hover: exclude from insecure lockscreen (2/2)

Enable/disable hover notifications from insecure lockscreen

Change-Id: I011cfe31adae06e7ec43e08d9d8286cd9b554540
Revert "Audio: make safe headset volume user configurable"

This reverts commit 0b3397f1c9bffecccc2adf84c01cb3ab54ad1e36.
Launch Heads Up in floating window [2/2]

PS2: Add another setting for testing
PS3: Add missing string
PS4: Remove test preference

Conflicts:
	res/values/cr_strings.xml
	res/xml/heads_up_settings.xml

Conflicts:
	res/values/simpleaosp_strings.xml
Remove Slim QuietHours 2
Squashed commit of the following:

commit ecb9e2ffd8b3c0f485a1049b84da877a3665c5b2
Author: MrBaNkS <banksmi09@gmail.com>
Date:   Sat Aug 2 00:38:09 2014 -0500

    Revert "Settings:Quiet Hours [2/2]"

    This reverts commit 132c537240b2a639d01e66762a8252b4fb7710bf.

commit 413c028f2a6edfd7104c0f19dc2bf2e19d0c3031
Author: MrBaNkS <banksmi09@gmail.com>
Date:   Sat Aug 2 00:21:05 2014 -0500

    Revert "Settings: Quiet Hours Automatic Switch (2/2)"

    This reverts commit a0682f0e20017bf75344bf1dbee0304c93c41373.

commit 0a4c927ef7dff6d942b98c3ffe158bc970189179
Author: MrBaNkS <banksmi09@gmail.com>
Date:   Sat Aug 2 00:17:32 2014 -0500

    Revert "Settings: Add "Is Starred" to Quiet Hours (1/1)"

    This reverts commit 98b99c11d551c52188ec9133d00b41ef84bcab9e.

commit 7e529283db66ef8431903f8f982b22463d1087ad
Author: MrBaNkS <banksmi09@gmail.com>
Date:   Sat Aug 2 00:16:09 2014 -0500

    Revert "Remove unused quiethours drawables"

    This reverts commit b05bbc9aca5d33986295b5217a947951989d0382.

commit b05bbc9aca5d33986295b5217a947951989d0382
Author: MrBaNkS <banksmi09@gmail.com>
Date:   Fri Aug 1 10:57:00 2014 -0500

    Remove unused quiethours drawables
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
[2/2] TrafficMeter: added option for auto-hiding on inactivity

Thanks to Mahdi & C3C0
Volume Rocker: Hardcode music track seek option (2/2).

* The feature is enabled by default but not configurable.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
More precise network traffic category string
Revert "Add a dependency for screen-on led"

This reverts commit cd8988528c80a181e25ee3ada310332a01315279.
Revert "Attack of the string editing Titan"

This reverts commit 71190b0935a358f72c3a29c220924a5e7f2a289a.
Revert "[2/2] Settings: Option to enable Notification Light when screen is on"

This reverts commit 63fd4fd73f9ec7ba8721354d1ae1ef48ac8e967e.
Couple of string edits
Theme card lockscreen targets

Conflicts:
	res/layout/lockscreen_targets.xml
	res/values/mahdi_colors.xml
Themeable pager tab strip
Move colors to simpleaosp_colors.xml
Input settings: fix empty screen when launching from keyboard

Fixes AOSPA-439

Change-Id: I70a61d82f9cddbc88b8fb803081336bb79a98fa1
Blacklist: Avoid crash when dialog dismissed via back button.

A user usually presses the back button only
when he/she does not want the changes to be saved.
Hence we need to revert the changes that took place
when the dialog is dismissed with back button.

Change-Id: Ifa3ef41f02f11d1e1627071532d8f915e3b445b6
Update drawables for settings app

It had old drawables. Updated ones are from Android's action bar pack

Change-Id: If9cbc0b196371b138b238c847f96d4da749d154f
Battery style: Change option's icon.

Thanks to Lo Hout for the drawables.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>