some fixes for carrier label/notification shortcuts
more fixes
Framework: Notification Shortcuts (1/2)

This feature adds shortcut icons to the bottom of the notification drawer.
Preview: http://goo.gl/hSHQM

Feature highlights:

- Select up to 16 different shortcuts
- Link to any application or activity
- Use the default application icon, pick from an image or pick from included stock icons
- Colorize application/image icons as well as stock
- Hide carrier label

Change-Id: I9a2770c560c765453549b8f99598afbbb24e663a

Conflicts:

	packages/SystemUI/res/layout/status_bar_expanded.xml
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
Notification shortcuts spacing and tablet transition fix

Change-Id: Ifcf888673b6ab80b43d427cf2a03b0beb7f56689
another duplicate derp
lets try this

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
get rid of this