Revert "Fix SysUI force closing plus hover and halo always enbled after reboots"

This reverts commit d7b7d29dc664424d4f217eef7aab35fd80d541f0.
Revert "Fix derps in TvStatusBar.java"

This reverts commit 500d648537eb8f557b19f0e27d067563a89b244b.
Revert "Fix PhoneWindowManager.java"

This reverts commit 75b8082227ba544c4c19fa51958b03f68a4e658c.
Revert "Halo master switch (1/2)"

This reverts commit b0246143a2f3fbb9d3df4eeb384ca826b6a0dbf9.
Revert "Hover master switch (1/2)"

This reverts commit 008a76c6914d405896d8997e8be1f1d9d9a337ec.
Themes: Use first asset entry for lockscreen wallpaper

The current implementation assumes the wallpaper will be named
either wallpaper.png or wallpaper.jpg.  If this is not the case
the wallpaper is not applied.  This patch implements the lockscreen
wallpaper the same way that the regular wallpaper is done.

Change-Id: I9f3dd299c1e61158fa53c163f7e42e21e2f9b1dc
Halo master switch (1/2)

This commit remove halo button from status bar expanded and add a new option into halo settings allowing the user to enable or disable it using a checkbox

Change-Id: Ib3f4fbee4a2a63a02eab802cd9a5ff16b370b622
Merge "MountService: Handle UUID in list response" into cm-11.0
Wifi: Use bss->age identifier for wifi scan results

This value will be used as "timestamp" and Google Play Services
uses this value for identifying sane wifi scan items.

The current timestamp (tsf=) has a different meaning, which causes
the Google Location Resolver to ignore all wifi scan entries and
therefore no location can be resolved.

This solution is already done on batched result parsing, but
missing on the traditional scans.

Change-Id: I36a1aeb666379e6a010298f09161e971012db83f
Activity chooser "Always" button is not working

When ResolverActivity is created with a custom list of matching
applications (rList) as in NFC case, and the alwaysUseOption is
set to true, the prferredActivity is not saved even if the user
presses the "always" button.

When a list is provided the variable mBaseResolveList will be
!= null. This will set mOrigResolveList = null.

When an activity is choosen and one of the buttons are pressed
onIntentSelected is called. The first thing this method does
is to check mAdapter.mOrigResolveList != null, however in this
case mOrigResolveList is always null, and the value is not
saved as PreferredActivity.

This problem was introduced in
6d8dfbd8149942f25f2b9643a12f1fb38f3be834.

Change-Id: I9eac41b7861b5e68ad3978af0dc0285f2a34eb88
Keyguard: fix NPE setting lockscreen wallpaper

After boot the view might not be laid out and so getWidth() and
getHeight() return 0 and will cause a NullPointerException in
createBitmap().

Change-Id: Ibacf4199a69709dc34d21695732c2a5360533a23
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "keyguard: force marquee effect for carrier text" into cm-11.0
PackageManager: Add option for single threaded dexopt

* Execute all dexopt invocations on the main thread instead of using the
  ExecutorService when persist.sys.dalvik.multithread is set to false.

Change-Id: I3b8499d5af5091ad7abcddf006f8f2837943903b

Conflicts:

	services/java/com/android/server/pm/PackageManagerService.java
HeadsUp: Add heads up blacklist options. (1/2)

Change-Id: If9e5eed658871400b3c21d9354262e0887bc592e

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
HeadsUp: Fix resetHeadsUpDecayTimer.

    - If user has forced immersive mode through expanded desktop,
    we shouldn't hide the heads up notification quickly.

Signed-off-by: Roman Birg <roman@cyngn.com>
Signed-off-by: Adnan Begovic <adnan@cyngn.com>

Change-Id: I6ac015ce5c28216cafd3ce96f8d1993495b26897
Themes: Use default_wallpaper for HOLO lockscreen wp

Change-Id: I9c7fd29c99d13e811993eb9b3b045010431ccad0
Themes: add ability to theme quick settings battery tiles

This is to make the battery tiles more uniform to the rest
of quick settings and also allow the background to be themed

http://i.imgur.com/AA5bkMK.png

Change-Id: Iec03572a0fa3619d2652f30b6c260a278ed0c86b

Conflicts:

	packages/SystemUI/res/layout/quick_settings_tile_battery.xml
Fix merge derp in BaseStatusBar.java

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
HeadsUp: Add heads up quicksettings tile. (1/2)

Change-Id: Ibc6ffffb48ac1831ee5fe398577023960e0e79d4

Conflicts:

	core/java/com/android/internal/util/cm/QSConstants.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java