Merge remote-tracking branch 'tmo/themes-2.3.1_r1' into themes-4.0

* Adapt to ICS API changes
* Remove part of idmap due to conflicts
* Restructure statusbar code
* Fix issues with PowerWidget on phones to avoid the CM7 hackish
  restart of SystemUI
* Add reinflation to properly redo status icons on tablets

Conflicts:
	core/java/android/app/ActivityManager.java
	core/java/android/app/ActivityThread.java
	core/java/android/app/ContextImpl.java
	core/java/android/content/pm/ApplicationInfo.java
	core/java/android/content/pm/IPackageManager.aidl
	core/java/android/content/pm/PackageParser.java
	core/java/android/content/res/AssetManager.java
	core/java/android/content/res/CompatibilityInfo.java
	core/java/android/content/res/Configuration.java
	core/java/android/content/res/Resources.java
	core/java/com/android/internal/os/ZygoteInit.java
	core/jni/AndroidRuntime.cpp
	core/jni/android_util_AssetManager.cpp
	core/res/AndroidManifest.xml
	data/etc/platform.xml
	include/utils/AssetManager.h
	include/utils/ResourceTypes.h
	libs/utils/Android.mk
	libs/utils/AssetManager.cpp
	libs/utils/ResourceTypes.cpp
	media/java/android/media/RingtoneManager.java
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/TrackingView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/am/ActivityManagerService.java
	test-runner/src/android/test/mock/MockPackageManager.java

Change-Id: Icabcd2c7b07dcbf174789b34f960360b87d7f27a