fix imports
	modified:   packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
base: ActiveDisplay: fix for disappearing notification bar

What a derp
http://jira.omnirom.org/browse/OMNI-158
http://jira.omnirom.org/browse/OMNI-101

PS2
dont do it on secure lockscreens

PS4
check if lookscreen is enabled

Change-Id: Idf7fd7c15fcd87e2efb62f0a234e15f1df1921e8

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java

	modified:   packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
[1/3] TeloRadio frameworks_base
	* Defines preferences

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
Base: Fix ActiveDisplay problem

follow kitkat changes
fix ActiveDisplay never disabled after using turn off display option

Change-Id: I1d178875c2643e872da40cae9781313fca53a6a5

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java

	modified:   packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
fix derp from last commit
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
Base: Fix for fix ActiveDisplay (Emergency)

this an emergency fix for last patch was merger

using another logic to determine, when need to hide Statusbar and Navigationbar
we dont want systemui visibility reset if lockscreen still enable and ActiveDisplay force to Turn Off

Correct ActiveDisplay visibility when launch Ongoing Notifications

fix Back button navbar cant work on some conditions

since AD detect User Activity, we dont want to override UserActivity inside View, so do only if AD visibilty are Gone

also add patch to keyguard, do not reset if ActiveDisplay visibility Visible
taken from Lockscreen Notification by David L.-W <david.leppla.weber@gmail.com>

Change-Id: I9d4001870db28ee04bdd622fa7147543b658251f
Base: more fix Active Display

fix http://jira.omnirom.org/browse/OMNI-352
fix http://jira.omnirom.org/browse/OMNI-357

Change-Id: Ibdd9617ce472213520261358bb6b77e9ff5eb523

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java

	modified:   packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
fix from last commit
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java
Base: Disable proximity sensor when screen goes on in ActiveDisplay/PocketMode.

Active Display (in Pocket Mode) currently only switches off the proximity sensor in some cases.
If the user switches on the screen itself, the sensor is left running. This change
stops the sensor as soon as the screen goes on. Active Display already started the sensor each
time the screen goes off.

PS2: In the mode that turns the screen off again when the device is pocketed,
the sensor stays on until you leave ActiveDisplay.

Change-Id: Id7afcd858f341ad929606d302c5741efa99a7c6f
Add Spanish translation (1/2)
HALO notification should open in floating window mode

Change-Id: I9625bb505c78b361fcb618c7a3b23105568b8d5c
PS1: If HALO is activated all HALO notifications will open in floating window mode. If HALO is not activated notifications will open in mutiwimdow mode.
PS2: If HALO is activated "add to split view" in the recent application list will not be shown.

Conflicts:
	core/java/android/inputmethodservice/InputMethodService.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
mutliwindow: notify split view if layout changed

Change-Id: I793b6d3dd05a5d1bbea178e646a1c6f14dec35c3
mutliwindow: notify split view if layout changed [2/2]

Change-Id: I2bbdd58dcf89cd70aa01a4c2bfc06641508f632c
Remove string calls
Better expose 'QS Tiles and layout' function

Reorganizing & customizing the QS tiles is one of our features, but it
is buried 4 clicks deep in Settings menus. This is not ideal.

Create a new icon on the main QS panel view to quickly launch into
the configuration page.

Screenshots: http://imgur.com/a/H3iN7

This respects all the existing flip animations and quick pulldown. Does not
interfere with the clear-all button either.

PS2: Rebase
PS3: Change intent
PS4: Add missing boolean
PS5: Whitespace & Use different icon
PS6: Address comments and add additional drawable densities
PS7: Fix reference to old drawable
PS9: Swap back to + icon
PS10: Typo

Change-Id: Ia715767ba2a7cfdd44b0fafa082877def6867440

Conflicts:
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
ActivityManager: Fix monkey tests

Change I30e38c6c27d339d55a8f9a0f4106185356a9b9a0 (adding ordered
broadcast prioritization) adds the assumption that every broadcast
generator has a full-fledged caller app, which isn't true for
monkey-created tests. Make sure the caller is a full app before
checking if it is AID_SYSTEM to avoid an NPE

Fixes com.android.cts.monkey.*

Change-Id: Ide0dd046c6c5eb10ab4acb504237b58cbbbd8cfa

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java
storage: Don't list removed volumes in storage list

 * Don't tell apps that USB storage or empty SD slots are available for
   use. This fixes errors about trying to create dirs in vold as well
   as the relevant CTS cases.

Change-Id: Ic763d40c19b0bb9f7497cc1515baf1661d76e9ee
Modify alarm tile to show alarms when clicked

Change-Id: I76002b37dfe81c4e8973b3ef3f70fd67c26b1e4e
keyguard: fix delay lock screen sound

Change-Id: Ia4cd2c856df1573856386e1597dcc0a9600d25a5
JIRA: CYAN-3362
Issue: https://jira.cyanogenmod.org/browse/CYAN-3362
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>