When DPM is updated while lock screen is inhibited, don't
unconditionally enable lock screen.

Change-Id: Iab2af06eb8e41fbcfc6adfbeb5b42a9bbf446fe9
Delay closing the notification area after swiping a little closer.

Use the same value as when removing all notifications.

Change-Id: Id11a48bc47487fd7763503dcbc769d9dbf5ad16a
Send out USER_PRESENT broadcast on screen on if lockscreen is disabled.

This makes sure to turn off the notification LED on screen on when the
lockscreen is disabled by profile or e.g. by lockscreen toggle tile.

Change-Id: I0f6a5f9a021abd2799c22c744ab1180cee027409
Merge "Send out USER_PRESENT broadcast on screen on if lockscreen is disabled." into cm-10.1
Merge "Delay closing the notification area after swiping a little closer." into cm-10.1
Merge "When DPM is updated while lock screen is inhibited, don't unconditionally enable lock screen." into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1