HALO: support (2/2)

Change-Id: I03cd7cdea21ba5900783b3a906667fcfc749222f

halo fix

Change-Id: I8ebf9e0f630f60b215cd4b8a1ad01b0f72c6172f

merge Finished

Change-Id: Ib1ade618e23ff2fbc749fdbe326642a6b20ec305

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/pie_control_panel.xml
	packages/SystemUI/res/layout/pie_expanded_panel.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/values-zh-rCN/mk_strings.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/mk_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/NavigationButtons.java
	packages/SystemUI/src/com/android/systemui/statusbar/PieControl.java
	packages/SystemUI/src/com/android/systemui/statusbar/PieControlPanel.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/pieview/PieExpandPanel.java
	packages/SystemUI/src/com/android/systemui/statusbar/pieview/PieItem.java
	packages/SystemUI/src/com/android/systemui/statusbar/pieview/PieMenu.java
	packages/SystemUI/src/com/android/systemui/statusbar/pieview/PieStatusPanel.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/PiePolicy.java

Conflicts:
	core/java/android/app/INotificationManager.aidl
	packages/SystemUI/res/values-zh-rCN/strings.xml
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/am/ActivityRecord.java
	services/java/com/android/server/am/ActivityStack.java