default smart pulldown to 2

Change-Id: I09216cf4e6f7995d5f53f7e2fcc0dadb0d9a2c96
Merge "Use actual storage type of sdcard/usb (2/2)." into kitkat
Add button backlight settings

Change-Id: Ie998740dd226d98a3935f70aa02b4533b871f759
Use actual storage type of sdcard/usb (2/2).

Currently, storage volume description for mount/unmount/format determined at
build time using PRODUCT_CHARACTERISTICS. For device which has only a sdcard or
only support usb storage, displayed description is correct. For device which has
both storage, the displayed description is totally wrong.

Use of actual storage type at runtime can eliminate the needed to specify
product characteristics, either default or nosdcard.

Change-Id: I9f8d53a4648d960f1009b1fe94787eecd4343427
Properly apply edit dialog brightness value.

Change-Id: If0bc90f045e5549dced296a7944e9ed0ea98b0c9
Merge "Properly apply edit dialog brightness value." into kitkat
quiethours: refresh TimeRangePreference preference on resume

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

AICPfy

Change-Id: Ia06a21aad36e757c0ed89ac81305f9b531f811fd
Merge remote-tracking branch 'ap/kitkat' into kitkat
Remove derp

Change-Id: If8ac1d9a845ce7e2d8a89ebbfdf70d04998a2dd0
Open app when clicking on icon in App Info screen

Based on Xposed module Shortcut in App Info:
http://repo.xposed.info/module/com.mohammadag.shortcutinappinfo

There is no vibration as in the module as I didn't find it necessary

Change-Id: I07b3f947aaaa13702adba3b4e78bb780fe861baf
Merge "Open app when clicking on icon in App Info screen" into kitkat
Merge "Settings: Notification Shortcuts [2/2]" into kitkat
Merge remote-tracking branch 'ap/kitkat' into kitkat
Settings: Add option to always show battery status on lockscreen (2/2)

Based on the feature by burnsra in CM7
Authored by blunden
Tweaked by dvtonder
Change-Id: I1c8c8eef3d0c913c621f735e7d5e395c8768fe76

lockscreen battery status: add off option (1/2)

AICPfy:
PS2: AICP extras go to _aicp.xml
     Edit Lockscreen.java code

Change-Id: I06dd1b81826bdb1c1e35b72d99970f97dcad1a34
Settings: Notification Shortcuts [2/2]

Patchset 2: Added hide carrier label toggle, added multi-user support,
fixed whitespace, cleanup of code.

AICPfy:
PS2: Rebase

Change-Id: Ief5cc4857dc7ea9fe886f74f09ed14775cf7bb5e
Signed-off-by: STELIX <ssspinni@gmail.com>
Merge remote-tracking branch 'ap/kitkat' into kitkat

Conflicts:
	src/com/android/settings/aicp/Lockscreen.java
Settings: Slimrecents card/text color [1/2]

Allows user to set custom colors for Slimrecents card
    header text and background.

AICPfy

Change-Id: I6cd62c14f0d2b1aba54efa7dfa0c8a3db7669a9e
Edit Pie activation/deactivation toast string

Change-Id: I545aa4f31bd9b462d0404ccbdf313fd2b46c6d8a
Settings: Fix crash if apps to open are not installed

Some external apps (AICP OTA, Kernel Tweaker, OmniSwitch
and RomControl) are hooked into Settings. If these aren't
installed (e.g. the user removed it), the corresponding
settins should be hidden.

PS2: fix whitespace

Change-Id: I56ee0d2e7eab67f6bf996bb48ff1d0214bbe96e7
CryptKeeper: update emergency call button to Holo

Change-Id: Id98a3345a7bb99b485ef608cec4319a84c040081