Permalink
Browse files

Commit themes to AOKP:

Squashed commit of the following:
maniac103: Allow theming of framework UI elements - a528877173
rmcc: SimUnlockScreen: Explicitly register themeChange receiver - 8da5dd0a5
rmcc: Fix theming of the Shutdown Thread - 0d6dea4e2f
rmcc: Merge branch 'themes-4.1.1' into cm10 - 5a35f209e

Change-Id: I16fff820fcf74394ce2884106887f8e284ffe235

Conflicts:
	core/java/android/app/ActivityManager.java
	core/java/android/app/ActivityThread.java
	core/java/android/app/ContextImpl.java
	core/java/android/content/Intent.java
	core/java/android/content/SyncManager.java
	core/java/android/content/pm/ApplicationInfo.java
	core/java/android/content/pm/PackageManager.java
	core/java/android/content/pm/PackageParser.java
	core/java/android/content/res/Configuration.java
	core/java/android/content/res/Resources.java
	media/java/android/media/AudioService.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/SimUnlockScreen.java
	services/java/com/android/server/DeviceStorageMonitorService.java
	services/java/com/android/server/InputMethodManagerService.java
	services/java/com/android/server/PowerManagerService.java
	services/java/com/android/server/UiModeManagerService.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/pm/Settings.java
	services/java/com/android/server/wm/WindowManagerService.java
	test-runner/src/android/test/mock/MockPackageManager.java
  • Loading branch information...
1 parent 4c1a5a8 commit 507c144a89dea570af796a5cc40e19ef8da7eab7 @xoomdev xoomdev committed Jul 27, 2012
Showing with 4,469 additions and 229 deletions.
  1. +1 −0 Android.mk
  2. +25 −0 core/java/android/app/ActivityManager.java
  3. +162 −8 core/java/android/app/ActivityThread.java
  4. +10 −0 core/java/android/app/ApplicationPackageManager.java
  5. +19 −1 core/java/android/app/ContextImpl.java
  6. +22 −0 core/java/android/content/Intent.java
  7. +19 −1 core/java/android/content/SyncManager.java
  8. +5 −0 core/java/android/content/pm/ActivityInfo.java
  9. +28 −0 core/java/android/content/pm/ApplicationInfo.java
  10. +244 −0 core/java/android/content/pm/BaseThemeInfo.java
  11. +3 −0 core/java/android/content/pm/IPackageManager.aidl
  12. +73 −0 core/java/android/content/pm/PackageInfo.java
  13. +12 −0 core/java/android/content/pm/PackageManager.java
  14. +73 −1 core/java/android/content/pm/PackageParser.java
  15. +3 −0 core/java/android/content/pm/ThemeInfo.aidl
  16. +205 −0 core/java/android/content/pm/ThemeInfo.java
  17. +158 −0 core/java/android/content/res/AssetManager.java
  18. +14 −2 core/java/android/content/res/CompatibilityInfo.java
  19. +72 −2 core/java/android/content/res/Configuration.java
  20. +117 −0 core/java/android/content/res/CustomTheme.java
  21. +22 −0 core/java/android/content/res/PackageRedirectionMap.aidl
  22. +90 −0 core/java/android/content/res/PackageRedirectionMap.java
  23. +27 −1 core/java/android/content/res/Resources.java
  24. +46 −0 core/java/android/os/SystemProperties.java
  25. +42 −0 core/java/com/android/internal/app/IAssetRedirectionManager.aidl
  26. +56 −0 core/java/com/android/internal/app/ThemeUtils.java
  27. +3 −1 core/java/com/android/internal/os/ZygoteInit.java
  28. +1 −0 core/jni/Android.mk
  29. +2 −0 core/jni/AndroidRuntime.cpp
  30. +354 −12 core/jni/android_util_AssetManager.cpp
  31. +176 −0 core/jni/android_util_PackageRedirectionMap.cpp
  32. +13 −0 core/res/AndroidManifest.xml
  33. +5 −0 data/etc/platform.xml
  34. +17 −1 include/androidfw/AssetManager.h
  35. +68 −0 include/androidfw/PackageRedirectionMap.h
  36. +13 −0 include/androidfw/ResourceTypes.h
  37. +345 −0 include/androidfw/ZipEntry.h
  38. +270 −0 include/androidfw/ZipFile.h
  39. +3 −0 libs/androidfw/Android.mk
  40. +137 −74 libs/androidfw/AssetManager.cpp
  41. +209 −0 libs/androidfw/PackageRedirectionMap.cpp
  42. +115 −1 libs/androidfw/ResourceTypes.cpp
  43. +31 −2 media/java/android/media/AudioService.java
  44. +22 −0 media/java/android/media/Ringtone.java
  45. +82 −45 media/java/android/media/RingtoneManager.java
  46. +6 −5 packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
  47. +2 −1 packages/SystemUI/res/layout/status_bar.xml
  48. +3 −0 packages/SystemUI/src/com/android/systemui/SystemUI.java
  49. +4 −0 packages/SystemUI/src/com/android/systemui/SystemUIService.java
  50. +4 −0 packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
  51. +4 −0 packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
  52. +53 −13 packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
  53. +7 −1 packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
  54. +6 −0 packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
  55. +30 −3 packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
  56. +24 −5 policy/src/com/android/internal/policy/impl/GlobalActions.java
  57. +15 −5 policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
  58. +73 −0 services/java/com/android/server/AppsLaunchFailureReceiver.java
  59. +397 −0 services/java/com/android/server/AssetRedirectionManagerService.java
  60. +20 −1 services/java/com/android/server/DeviceStorageMonitorService.java
  61. +17 −1 services/java/com/android/server/InputMethodManagerService.java
  62. +19 −0 services/java/com/android/server/NotificationManagerService.java
  63. +18 −0 services/java/com/android/server/SystemServer.java
  64. +16 −1 services/java/com/android/server/ThrottleService.java
  65. +18 −1 services/java/com/android/server/UiModeManagerService.java
  66. +41 −8 services/java/com/android/server/am/ActivityManagerService.java
  67. +17 −1 services/java/com/android/server/connectivity/Tethering.java
  68. +187 −20 services/java/com/android/server/pm/PackageManagerService.java
  69. +1 −1 services/java/com/android/server/pm/Settings.java
  70. +12 −2 services/java/com/android/server/power/PowerManagerService.java
  71. +22 −4 services/java/com/android/server/wm/WindowManagerService.java
  72. +11 −0 test-runner/src/android/test/mock/MockPackageManager.java
  73. +5 −1 tools/aapt/Bundle.h
  74. +12 −2 tools/aapt/Main.cpp
  75. +11 −1 tools/aapt/ResourceTable.cpp
View
@@ -169,6 +169,7 @@ LOCAL_SRC_FILES += \
core/java/com/android/internal/app/IBatteryStats.aidl \
core/java/com/android/internal/app/IUsageStats.aidl \
core/java/com/android/internal/app/IMediaContainerService.aidl \
+ core/java/com/android/internal/app/IAssetRedirectionManager.aidl \
core/java/com/android/internal/appwidget/IAppWidgetService.aidl \
core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \
core/java/com/android/internal/backup/IBackupTransport.aidl \
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2007 The Android Open Source Project
+ * This code has been modified. Portions copyright (C) 2010, T-Mobile USA, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,6 +29,7 @@
import android.content.pm.IPackageDataObserver;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Point;
@@ -1620,6 +1622,16 @@ private RunningAppProcessInfo(Parcel source) {
return null;
}
}
+ /**
+ * @hide
+ */
+ public Configuration getConfiguration() {
+ try {
+ return ActivityManagerNative.getDefault().getConfiguration();
+ } catch (RemoteException e) {
+ return null;
+ }
+ }
/**
* Returns a list of application processes that are running on the device.
@@ -1986,4 +1998,17 @@ public boolean isUserRunning(int userid) {
return false;
}
}
+
+ /*
+ * @throws SecurityException Throws SecurityException if the caller does
+ * not hold the {@link android.Manifest.permission#CHANGE_CONFIGURATION} permission.
+ *
+ * @hide
+ */
+ public void updateConfiguration(Configuration values) throws SecurityException {
+ try {
+ ActivityManagerNative.getDefault().updateConfiguration(values);
+ } catch (RemoteException e) {
+ }
+ }
}
Oops, something went wrong. Retry.

0 comments on commit 507c144

Please sign in to comment.