fix derp in new quiethours merge and flip tiles
Revert "AudioManager: make swap volume buttons RTL aware"

This reverts commit c915cf91efb05861c02e8e8a57b6a0374d0177f6.
Revert "Swap volume buttons when the screen is rotated by 90 or 180 degrees"

This reverts commit 834d8059d02aead6d5e882f96dee2a1fb969c1af.
Disable Immersive Messages [2/2]

Based off Xposed module by GermainZ

https://github.com/GermainZ/ImmersiveModeDontPanic

Change-Id: I4835cac08a9e525ec15aa4d1ee84329970ec6a72

Conflicts:

	core/java/android/provider/Settings.java
Launch floating notifications from notification panel (long click)
Recents: Launch as Floating App
SlimRecents: add floating window menu
Add non-floating option to recents menu
Do not kill app when closing floating window
Internal Memory Check Quick Panel

Change-Id: I45cca28f31f97aa86b268e39a833ba5a49b47e32

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
framework: Add compass tile (1/2)

Add a compass tile to quick settings.
Clicking on it enables the sensor and clicking again disables it.
Status Bar Color [1/2]

Change-Id: I7c66b9b8bc0d733141b28d78324986ad6a27dac2
[1/2] SystemUI: Add time-context headers to the notification header

This commit adds image headers to the notification panel header,
based on the date/time. There are pictures for morning, afternoon
and night, as well as special events like Christmas and new
year's eve.
More will be coming, with eventually a way to use an external
(as in, Internet) provider for those pictures.

Squashed update images and times

Change-Id: Ie3321e9a3e0637d6ba8094dd46aee36c41354713

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
[2/2] Base: notification drawer: custom clock & calendar shortcut

OmniGears: https://gerrit.omnirom.org/#/c/4810/

PS9:
fix for multi-user

Change-Id: I941cdebde0b9d90c92f83df9e44f40bb4d4cce63

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
SmoothProgressBar: User Custom ProgressBar Setting[2/2]
fb: Show heads up at the bottom of the screen (1/2)

Due of user requests and indeed especially on hw key devices for a better
workflow we add an option to show heads up notifications on the bottom instead
of the top.

Animation we leave as is due that if it slide from the bottom into the screen it happens
to often that the user accidentaly interacts with it. If it comes from the top of the
container we add, the user has enough time to realize it. Sometimes a ms can make a big difference.

As well this commit fixes the wrong gap on the top if user boots up directly
into immersive mode.

PS:
- if IME keyboard is showing show the heads up on the top to do not disturb the typing.
PS:
- NPE if updatePosition is called to early from the system.

Change-Id: I5ec2ab97f3309e9e690bc60c9f5cfd19d4dab516

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Squashed: App Circle Sidebar [1/2]

[1/2] Base: implement App circle sidebar

add whitelist app to include into circle view
rebased
make standalone patch

PS.15 : rebased
PS.16 : cleanup

Base: App Circle sidebar (add support floating window)

PS.8 : rebased
PS.9 : add support minimize/maximize window

App Circle Sidebar: Support for Configurable Trigger Region[1/2]
Show plugged type (AC / USB) on QS battery tile
Revert "AssetManager cookies should be int32_t and not void*."

This reverts commit e50125939acd3a4c1194df364788bc462485793c.
MEGASQUASH: New Theme Enginer from scratch! [2/n]
Squashed commit of the following:

    Themes: Add ability to apply color filters to composed icons
    Make sure ThemeConfig is non-null when loading resources
    Themes: setUserRequired(false) when updating audibles
    Themes: Allow clearing the wallpaper and ls wallpaper
    Themes: Pass resource IDs instead of bitmaps [1/2]
    Themes: Build icon cache when applying icons
    Add column for tracking when a theme was installed
    Include default wallpaper in LockscreenWallpaperPickerActivity
    Load original drawable if cached icon throws NotFoundException
    Themes: Make notification list bg themeable
    Themes: Add helper methods for creating complete component maps
    Themes: Add STYLE_THUMBNAIL to PreviewColumns
    Add SET_WALLPAPER permission to SystemUI
    Catch all exceptions when retrieving ComposedIconInfo
    Themes: Find wp asset when APK has dir entries
    Themes: Support applying components from multiple themes [1/3]
    Fix ResourceNotFoundException when updating  applied theme
    Themes: Add URI for querying previews of applied components.
    Themes: Add method to "apply all" a theme
    Themes: Style, boot animation, and wallpaper previews
    Themes: Add icon previews to ThemesContract
    Use systemui's applied theme for notifications.
    Allow specifying a theme when creating a Context
    Add getThemedResourcesForApplicationAsUser()
    temp fix without nav bar separately
    Modify config to support app specific themes [1/4]
    Themes: Update LoadedApk resources.
    Themes: Use default_wallpaper for HOLO lockscreen wp
    Themes: Use first asset entry for lockscreen wallpaper
    Theme IME switcher alert dialog
    Themes: Use INSTALL_LOCATION_INTERNAL_ONLY for legacy icon packs
    Keyguard: fix NPE setting lockscreen wallpaper
    Fix PackageManagerService WTF in systemReady()
    WallpaperCropper: include wallpapers from themes!
    add missing import
    Add previews to the themes contract.
    Add status bar and navigation bar to ThemesContract
    Remove DEFAULT_THEME_APPLIED_ON_FIRST_BOOT
    Install themes and icon packs for secondary users.
    Don't create idmap if app doesn't have resources.arsc
    Fix icon support for secondary users.
    Themes: Set bounds on iconUpon
    Don't log an error if we cannot open icon hash
    Themes: Get resources with an explicit theme attached.
    Themes: Add categories to theme change intent.
    Themes: PhoneWindowManager UI context on demand
    Themes: Don't kill launchers that handle the theme change
    Themes: Don't set icons for iconpack that is applied.
    CM11 Themes: Add support for composed icons [1/2]
    Themes: Keyguard: Fix NPE setting lockscreen wallpaper
    Theme special volumeup+down volume panel
    sync status bar transparency state on theme change
    Themes: Avoid compiling icon packs every boot
    Themes: Check CRC of APK MANIFEST.MF at install
    synchronize updateStringCache on mAccessLock
    Don't cleanup overlay mapping for non-theme apps
    Themes: uninstallThemeForAllApps shouldn't check if map is empty if it's null
    Themes: Update last postFinish call
    WallpaperCropper: do not display null bitmaps
    Themes: Delete icon resources during uninstall
    Themes: remove unused code
    Make theme change broadcast a protected broadcast.
    Themes: Handle apps using "original-package" tag
    Themes: Add '|' delimited list of components to broadcast
    Cleanup app->{theme1,theme2...} mapping on uninstall
    Revert "Reduce memory leaks by removing all views."
    No need to hide flags in configChange
    WallpaperCropper requires these permission.
    Fix wallpapers not applying in full screen
    CM11 Themes: Don't kill setup wizards
    CM11 Themes: Add themeChange config change to manifest
    Reduce memory leaks by removing all views.
    add a getter for the x and y offsets of the wallpaper window
    Themes: Add read/write permissions [1/2]
    idmap: reduce CREATING STRING CACHE verbosity
    SystemUI: Make wifi combo margin themable
    CM11 Themes: Use package name from AndroidManifest
    WallpaperPicker: Destroy cropview to avoid leaks
    Themes: Map themed icon to app after upgrade
    Themes: Fix bad idmaps for system themes
    CM11 Themes: Clear wallpaper mixnmatch entry on external change
    Notify callbacks on "any" wallpaper change
    Avoid app install failures from malformed themes
    Cleanup themes that fail to install
    CM11 Themes: Fix applyDefaultTheme implementation
    CM11 Themes: Expose applyDefaultTheme to public service
    Themes: Fix -110 install error [2/2]
    CM11 Themes: Get proper package name in attachThemeAssets
    CM11 Themes: Reduce "unable to load asset" log spam
    remove leftover t-mobile theme engine parts not used by new theme engine
    CM11 Themes: Allow defining a custom default theme [1/3]
    CM11 Themes: Handle legacy themes in createIdmapsForPackageLI
    CM11 Themes: Properly handle themeing apps on install
    Send broadcast when package is 'about' to be removed
    CM11 Themes: Don't set sys.refresh_theme on icon update
    Themes: Support launcher based icon packs [1/2]
    CM11 Themes: Fix how common resources are found
    CM11 Themes: remove handleThemeConfigChanges
    Wallpaper Overscroll and Transparent NavBar
    Add wallpaper pickers to seperate package [1/2]
    Lockscreen wallpaper for themes
    Keyguard: more consistency with the new lockscreen wallpaper
    frameworks: move keyguard wallpaper to system  (1/2)
    Frameworks: Lockscreen custom wallpaper (1/2)
    Set themes to install internal only
    CM11 Themes: Properly handle SystemUI theme package name.
    CM11 Themes: Include alarms in mixnmatch.
    CM11 Themes: Common overlay for sharing resources. [1/2]
    CM11 Themes: Ensure customTheme is not null.
    idmap: Don't log spam "CREATING STRING CACHE"
    Return system theme when SecurityException is caught.
    hide new AssetManager methods for themes
    Allow icons in shared restables to be themed
    fix build for the new theme engine
    CM11 Themes: Use theme name for audible name.
    CM11 Themes: Allow forcing idmap (re)creation.
    CM11 Themes: Remove type matching restriction
    CM11 Themes: Put overlays in their own group.
    Style previews [1/3]
    Fix segfault removing theme assets
    Cleanup theme assets when done with them
    CM11 Themes: Use 32bit hash to decide if idmap should be created
    CM11 Themes: Take into account ALL res/xml dirs
    SysUI: Don't recreate controllers.
    New Theme Engine [1/6]
    Runtime resource overlay, iteration 2, test cases
    New command line tool 'idmap'
    Remove T-mobile items not used by new theme engine
    Squashed commit of the theme engine support.

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/SettingsProvider/res/values/defaults.xml
Change label of sound tile when state is changed

It is a little bit confusing for the user when the sound label is always
identical. Changing this matches the behaviours of other tiles.

Shuhao Wu
http://review.cyanogenmod.org/#/c/64774/

modified by jisoo to update title based on actual state
frameworks: add persistent notification when USB OTG is connected

Tapping the notification will take the user into Storage settings, and
highlight the 'Unmount' option.

Change-Id: I650f3874a8295b2b8ffdaef78aff4b68e9cd574e
Signed-off-by: Roman Birg <roman@cyngn.com>
Base: Option to enable Notification Light when screen is on [1/2]

This makes it possible to let the Notification LED flash even when the screen is on