Halo y botones navbar

Conflicts:

	core/java/android/app/INotificationManager.aidl
	core/java/android/provider/Settings.java
	core/res/AndroidManifest.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/purity_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	services/java/com/android/server/NotificationManagerService.java