Settings: Disable slider shortcuts with custom lockscreen

These are not available with the custom lockscreen.

Change-Id: Ib67b97b597da0cf06d9d36b4fe7b40b55d0e2425
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: read keyguard package name from overlays

Change-Id: Ief4750c91aa22c2033d31aacfea4cfbe245d61a8
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings : Add contributors word cloud

Change-Id: I43dc37e7d164ae0a641e39bdcfbdaebad62c85fe
Merge "Settings : Add contributors word cloud" into cm-11.0
Revert "Settings : Add contributors word cloud"

This reverts commit 05ad817af10e4f4af8344a557a1cffe08f5507b1.
Merge commit '982d42f' into HEAD
Merge "Settings: Disable slider shortcuts with custom lockscreen" into cm-11.0
Revert "Conditionalize MSIM Network Settings"

Sorry, Dave, guess you're going to have to tolerate picking "alway open" option once.

My quick stab at selectively killing it to put you at ease seems to have introduced some funk.

This reverts commit c0213fbc85a540d086a4af71c20426c86c200fdc.
Merge "Settings: read keyguard package name from overlays" into cm-11.0
Settings: move keyguard wallpaper to system (2/2)

Change-Id: Id3bb66aa78c2e3dbd1170e74e33fcd160e5a70bb
Signed-off-by: Roman Birg <roman@cyngn.com>
Settings: Disable slider shortcuts with custom lockscreen

These are not available with the custom lockscreen.

Change-Id: Ib67b97b597da0cf06d9d36b4fe7b40b55d0e2425
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:

	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Merge remote-tracking branch 'upstream/kk44' into kk44