Fix build after merge of equalizer tile

Change-Id: I48551abc060569444f9785a3ef659fb2dc3f2138

Conflicts:
	packages/SystemUI/Android.mk
Quick Settings: Option to use floating window (1/2)

Allows the option of launching preferences from the quicksettings menu in a
floating window

Change-Id: Ie54545a4dc423484b6106a540f106467c25d8c49
Signed-off-by: Evan Anderson <evan1124@gmail.com>

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

Conflicts:
	services/java/com/android/server/ThemeService.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/pm/PackageManagerService.java
New Halo drawables thanks to Arz Bhatia and PA team

Change-Id: Ic63b433466d686a645133d987bfc17ba4b6ff42d

Conflicts:
	packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png
	packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png
	packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png
Fix HALO button in status bar, thanks to cristianomatos, arz bhatia & lion0738

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Add network usage stats to status bar (1/2)

Get the time delta between updates and use
that to show average bytes per second.

Change-Id: I63771220333a32063f675e6fc38c9aadb6de4274
Signed-off-by: SiraCuervo

Conflicts:
	packages/SystemUI/res/values/axxion_dimens.xml
	packages/SystemUI/res/values/axxion_styles.xml
Follow new 4.4 transition on Network Stats

Conflicts:

	packages/SystemUI/res/values/cr_styles.xml

Conflicts:
	packages/SystemUI/res/values/axxion_styles.xml
NetStats: Don't update stats when screen is off

Also moved registering of broadcast receiver and settings
observer to onAttachedToWindow() and unregistering to
onDetachedFromWindow() to avoid these being leaked.

Change-Id: Ia131a0db65c4c762b7f28493e812f9fb21358a27
Network stats custom colors (1/2)

Change-Id: I3c95a70273b111c7776f395f7baa60a77cea95dd

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

(cherry picked from commit 5cd96d62f0145ad5e1e9bc8def9c9f6abef51e65)

Conflicts:
	core/java/android/provider/Settings.java
Network stats: Hide if there's no traffic (1/2)

Change-Id: I8b770c7ad803c063cf995e5f88c8f44e0eeae86a
Revert "New Halo drawables thanks to Arz Bhatia and PA team"

This reverts commit edc3f734271a56994829a5a965a0dda6d4fa39c9.
Live Volume Steps [1/2]

lvs: transitioned volume steps volume normalization.

-This calculates an equivalent volume ratio for the new
volume steps.

-example: Volume steps are set at 60. Volume is set at 5. That is
very low volume. Then volume steps are switched to 5. Now you
are instantly in a state were your volume steps are 5 and your
volume is 5. That's full volume! This fixes that issue.

-So it basically keeps the volume from jumping around while your
changing volume steps. It may be a little lower but should be
very close.

Change-Id: I5ef6320a00c7b4cc978a166baf051344be929ede
Try to fix clear all button margin
Try to fix Clear all button
New Halo drawables thanks to Arz Bhatia and PA team

Change-Id: Ic63b433466d686a645133d987bfc17ba4b6ff42d

Conflicts:
	packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png
Floating window: Fix possible NPE

Avoid possible NPE if app provides no interface such as pushbullet's
test notification & other apps which provide one.

Change-Id: I35c13959296a56e44f21f1aee0a736e7f786aa57

Conflicts:
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

Conflicts:
	packages/SystemUI/res/values/axxion_strings.xml
Frameworks: Store dialpad showing state (1/2)

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
User Custom ProgressBar Setting [1/2]

Change-Id: I6aa369e7f1fee409e9af515937980f2afdb418de

Conflicts:
	core/res/res/values/symbols.xml

Conflicts:
	core/res/res/values/symbols.xml