base: fix constant conflict

There is a conflict 2 media type which shares the same constants which is a DVIX and JPEG.
which causes some app to think jpeg is a dvix video file
It was due to the merge of the qualcomm patches (patch: http://review.cyanogenmod.org/#/c/28960/ ) which was merged on the 23rd

Change-Id: Ida014adab4a954aa81a16d1ff401f9847f87d1a5
Custom NavRing and LaunchHelper

Forward port navring and launch helper

Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/SearchPanelView.java
	policy/src/com/android/internal/policy/impl/keyguard_obsolete/LockScreen.java

Change-Id: Idd8d43cc82eb9ba61552c72bd6574f8ccf9f5da2
Longpress navring disable fix

Derp... with this if the long press is off the behavoir is like stock.

Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Port Forward: NavBar Customization

Custom NavBar targets
--Zaphod-Beeblebrox

Fix Navbar for tablets & other non xhdpi devices
--Zaphod-Beeblebrox

Fix improper resizing of navbar icons in landscape
--kwes1020

navbar alpha settings ported from ics
--akellar

SystemUI: fix navbar alpha
--syaoran12

Make navbar background themeable for theme chooser apks
--NMILTNER

Bring back navbar color, glow color, glow dur from ICS
--me..

navbar: ability to open/close notification shade
--jonathongrigg

SystemUI: fixed glow color to look stock
--syaoran12

Bring back down arrow (when IME is showing)
--me..

fix IME down arrow for custom navbar
--Zaphod-Beeblebrox

Navbar: Allow for up to seven navbar buttons
--Stevespear426

IME Toggler as NavBar target
--BMc08GT

adjust navbar logic
--romanbb

Change-Id: I857bfd554d9f057b4c2e29f802635f752ca98576

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
SysUI: NavBar & Widgets rollup [1/2][WIP]
This will bring back NavBar widgets, along with some
changes/rollups on the NavBar side.
Very much a WIP. Just wanted to post where I was so others
could continue if I get busy.

2 :  Address some Tablet stuff
3 :  Icons & Strings
4 :  another icon
5 :  more icons & layouts
6 :  fix some shortcut/aokp action stuff- fix NavRing so it
     only inflates on swipe, not long press of home.
7 :  Roll in jubakuba's porting of Hide NavBar.  Really needed to
     be handled in this mega-NavBar commit rather than separately.
8 :  API change fix for setInitialDisplaySize
9 :  restore Searchlight (NavRing on lockscreen) that got removed
     during the previous edits.
10 : move togle classes under aokp package
11 : Fix reference in Phablet NavBar layout

Change-Id: I002e58366984d3a728987aba09f6a52b76ee2c59
Signed-off-by: Zaphod <mwilson@acesappraisal.com>

Conflicts:
	packages/SystemUI/Android.mk
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_hp.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_hp.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_hp.png
	packages/SystemUI/src/com/android/systemui/aokp/AokpTarget.java
	packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java