summaryrefslogtreecommitdiffstats
path: root/include/utils
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'tmo/themes-2.3.1_r1' into themes-4.0Ricardo Cerqueira2012-05-045-1/+713
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Fixed cyanogenmod issue 2861: asset redirection breaks access to ↵Josh Guilfoyle2011-03-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidManifest.xml. Themed asset managers lose the ability to access application assets without a cookie because the search order favors most recently added asset paths (theme apks are added last). So, searching for AndroidManifest.xml would always return the themes manifest, not the application manifest. The solution is to mark the themed asset path and ignore it when searching for cookie-less assets. This should not cause problems with theme application because the theme uses resource identifier based redirections which always retain the asset path cookie that is to be used to load the final resource.
| * Removed AssetManager#dumpResources.Josh Guilfoyle2011-02-042-2/+0
| | | | | | | | | | | | | | This method was used only for debugging and has not been useful for quite a long time. Change-Id: I38f3c60bb6a7400758623ac80faf2350e387d51e
| * Corrected whitespace trespasses.Josh Guilfoyle2011-02-042-10/+10
| | | | | | | | | | | | | | | | Many small whitespace mistakes slipped into the framework as the themes feature was developed. This patch reverts them to make a cleaner patch set against android-2.3.1_r1. Change-Id: I52223c1d572d4f013e37bebc5c11bb7b1c595eb3
| * Asset redirections are now managed by a system service.Josh Guilfoyle2011-01-204-129/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted the asset redirection design to use a common system service (AssetRedirectionManagerService) for synchronization and cache management. This replaces the old /data/res-cache design completely (nothing is written to disk now). This change also moves a large amount of code from the C++ layer to Java for parsing the theme meta data and redirection XML files, though the actual redirection still occurs at the native layer. Change-Id: I8820e39425135269f5e723534c4b9c8dc6841779
| * Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1Josh Guilfoyle2010-12-2318-219/+942
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/app/ActivityThread.java core/java/android/content/pm/ApplicationInfo.java core/java/android/content/pm/PackageParser.java core/res/AndroidManifest.xml services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java test-runner/src/android/test/mock/MockPackageManager.java
| * | Pass the high-level theme resource id into the redirection table layer.Josh Guilfoyle2010-12-231-2/+4
| | | | | | | | | | | | | | | This is necessary to provide the high-level style redirection heuristics (previously this was hacked to assume the Androidian's theme style id).
| * | Switched FileLock to use fcntl for compatability with the Java layer.Josh Guilfoyle2010-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The Java layer (i.e. Harmony) is currently implementing FileLock this way so we are aligning to be compatable with locks created from FileChannel#lock. This code is therefore fragile and depends on deep implementation details of Harmony. For this reason, this solution should be replaced with something more reliable.
| * | Fixed a crash when the currently applied theme is replaced by the ↵Josh Guilfoyle2010-12-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackageManager. When a package is removed but still has active AssetManager's referring to it, a request to retrieve the resource path (the APK) will fail, so the assets cannot be removed. The AssetManager's removeAssetPath API was adjusted to now accept a cookie instead of searching for it by the supplied asset path. This allows us to still remove asset paths that are no longer available. Change-Id: I862c66e7515a1b05ca3e47f82e52cdf2f1d95684
| * | Introduced an asset redirection system to the theme engine.Josh Guilfoyle2010-12-223-2/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the theme engine required careful redirection of only the highest-level "theme" style element, relying then on the theme attribute lookups to satisfy the demands of all themeable apps. This approach created significant challenges which required, in some cases, heavy modification for existing applications to support the engine. Custom widgets and themed components required special theme support in order to be reachable by the style engine alone. Similarly, a number of clumsy hacks were required around the framework to support certain components such as menus and tab widgets. The asset redirection system allows the theme to specify a redirection table which is consulted for nearly all final resource resolutions. This essentially means that once the theme is applied, any original resource being redirected would no longer be accessible by the AssetManager, instead being redirected to the matching resource in the theme itself. In order for this to function efficiently it is necessary to create cache files mapping resource integers from one package to another, even if those integers will change across releases. For this, one-time name to integer conversions occur, with the results written in a data format suitable for efficient reads for each AssetManager created. Currently this format must be parsed and cannot be directly mmaped though this will be addressed in future commits. Change-Id: Ie36e74314c600a72e03e568675a38801b7acd1ee
| * | Updated copyright headers.Josh Guilfoyle2010-11-182-0/+2
| | | | | | | | | | | | Change-Id: I4824be066a98194b4f7fa9a18682bf6701e069a6
| * | Merge commit 'themes/themes-eclair' into themes-2.2_r1Dirk Sigurdson2010-07-044-9/+639
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: api/current.xml core/java/android/app/ActivityManager.java core/java/android/app/ActivityThread.java core/java/android/app/ApplicationContext.java core/java/android/content/Intent.java core/java/android/content/pm/PackageInfo.java core/java/android/content/res/AssetManager.java core/java/android/content/res/Configuration.java core/jni/android_util_AssetManager.cpp media/java/android/media/Ringtone.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/am/ActivityManagerService.java test-runner/android/test/mock/MockPackageManager.java
| | * | Removed dynamic attribute assignment and related debug.Josh Guilfoyle2010-03-011-1/+0
| | | | | | | | | | | | | | | | | | | | This feature was originally used to support on-the-fly changes to themes such as colors. This support has long since been abandoned.
| | * | Merge branch 'themes-1.5r2' into themes-eclairJosh Guilfoyle2009-11-244-9/+640
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: api/current.xml core/java/android/app/ActivityThread.java core/java/android/app/ApplicationContext.java core/java/android/app/Dialog.java core/java/android/app/SearchDialog.java core/java/android/content/Context.java core/java/android/content/Intent.java core/java/android/content/pm/PackageInfo.java core/java/android/content/pm/PackageParser.java core/java/android/content/res/Configuration.java core/java/android/content/res/Resources.java core/java/android/widget/RemoteViews.java core/java/android/widget/TabWidget.java core/java/com/android/internal/os/ZygoteInit.java core/jni/android_util_AssetManager.cpp core/res/AndroidManifest.xml core/res/res/layout/search_dropdown_item_2line.xml core/res/res/layout/select_dialog_item.xml core/res/res/layout/select_dialog_multichoice.xml core/res/res/layout/select_dialog_singlechoice.xml core/res/res/layout/tab_indicator.xml core/res/res/values/attrs.xml core/res/res/values/public.xml core/res/res/values/strings.xml core/res/res/values/themes.xml libs/utils/Android.mk libs/utils/AssetManager.cpp media/java/android/media/RingtoneManager.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java services/java/com/android/server/am/ActivityManagerService.java services/java/com/android/server/status/StatusBarService.java tools/aapt/Main.cpp
| | | * | Add support for modifying ResTable on fly.Sergey Ten2009-09-232-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to either delete or add asset path after a ResTable object has been created for a given AssetManager. In past, the lack of such support forced us to implement update configuration functionality suboptimally, by recreating new AssetManager object from scratch on theme change. With this change, we can simply remove the "old" theme asset path and add the new asset path. We also need to make sure the Resources object nukes internal caches. CR:JoshG.
| | | * | Revert "This is a patch I've checked in in the old repo and apparently it ↵Josh Guilfoyle2009-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not ported to devpde01." This checkin introduced aapt changes to build on the device, which are no longer a required part of the flow. This reverts commit 30f0b7eac75e70e8cedce42b614f33ef5c0a5785. CR: Sergey Ten
| | | * | Changes allowing to set color attributes directly on a theme, without ↵Sergey Ten2009-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | (re-)generating resource bundle/theme apk.
| | | * | Add support for restoring asset paths stack in Asset ManagerSergey Ten2009-07-291-9/+20
| | | | |
| | | * | This is a patch I've checked in in the old repo and apparently it was not ↵Sergey Ten2009-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ported to devpde01. This is a first scoop of bringing in aapt tool on a device. We just build aapt as a stand-alone executable for both HOST and TARGET platforms. In future release, we plan to re-factor existing code to produce libaapt library (static for HOST and shared for TARGET), to make sure that the functionality implemented by the library would be exposed (via JNI) to the Java layer. That way, we would be able to invoke aapt in-proc from Java code, instead of spawning a separate process. Here is a brief description of the changes: 1. Introduced HOST_LIB compile flag to differentiate HOST and TARGET flavors. 2. Moved ZipFile.cpp and ZipEntry.cpp (libutils) from hostSources to commonSources, DESPITE GOOGLE's COMMENT in Android.mk. 3. Currently, only 3 following commands are supported by aapt on device: - create a compiled resource package (package command); - add new resource to existing package (add command); - remove resource from existing package (remove command).
| | * | | eclair snapshotJean-Baptiste Queru2009-11-1340-3092/+579
| | | | |
| | * | | donut snapshotJean-Baptiste Queru2009-08-311-0/+12
| | | | |
| | * | | donut snapshotJean-Baptiste Queru2009-07-311-2/+4
| | | | |
| | * | | donut snapshotJean-Baptiste Queru2009-07-292-33/+170
| | | | |
| | * | | donut snapshotJean-Baptiste Queru2009-07-217-144/+274
| | | | |
| | * | | donut snapshotJean-Baptiste Queru2009-05-203-85/+212
| | |/ /
* | | | GCC 4.7 now correctly implements the two-phase name lookup rulesJef Oliver2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | See: http://gcc.gnu.org/gcc-4.7/changes.html Change-Id: Iaf285e2ebf4456a063817858ffa358e9380e9012
* | | | BlobCache: implement cache serializationJamie Gennis2011-10-311-12/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds serialization and deserialization functionality to BlobCache, conforming to the Flattenable interface. Change-Id: Ibc99cb1c3d015f363d57d0713eabccec07ff975e
* | | | BlobCache: remove the mutex lockingJamie Gennis2011-10-311-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the mutex from the BlobCache class. The caller must be responsible for thread synchronization in order to properly implement the Flattenable interface, which is coming soon. Otherwise would be the potential for the cache contents to change between the call to the getFlattenedSize and flatten methods. Because the caller must do this synchronization anyway there's no reason to also some synchronization inside BlobCache. Change-Id: Ie1f4f6f82b78744f46a41ce863cac0cad276a20e
* | | | Reduce the size of libhwui by 50%Romain Guy2011-10-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes unnessary symbols. All symbols are hidden by default, public APIs with exported symbols are explicitly marked with ANDROID_API. Change-Id: I692fde432a86c12108de1cfd1f6504919a7d5f3f
* | | | Fix regression in CursorWindow.copyStingToBuffer.Jeff Brown2011-10-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5332296 Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
* | | | Add mechanism for Parcel to not allow FDs to be written to it.Dianne Hackborn2011-10-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is to help implement issue #5224703. Change-Id: I026a5890495537d15b57fe61227a640aac806d46
* | | | A new API "androidGetThreadPriority"Andreas Huber2011-09-161-0/+4
| | | | | | | | | | | | | | | | Change-Id: I6baeead8c70460863343fd557250635fb1e6a170
* | | | Merge "Add C++ thread API androidGetThreadSchedulingGroup"Glenn Kasten2011-08-291-0/+7
|\ \ \ \
| * | | | Add C++ thread API androidGetThreadSchedulingGroupGlenn Kasten2011-07-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API is intended for applications that need to read a thread's scheduling group, while using the higher-level (C++) family of thread APIs. Change-Id: I5e58017f74c3989b20b5b1cc2bc4483c95720520
* | | | | am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 ↵Xavier Ducrohet2011-08-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operator+ to actually work" * commit 'ddf155b8338eb894a97612e4cb21257c11d8434a': Fix String16 operator+ to actually work
| * \ \ \ \ am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to ↵Xavier Ducrohet2011-08-171-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually work" * commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1': Fix String16 operator+ to actually work
| | * \ \ \ \ am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"Xavier Ducrohet2011-08-171-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88512f59bc051a42f4dd70acc8af5622f7e99db6': Fix String16 operator+ to actually work
| | | * \ \ \ \ am a8313e71: Merge "Fix String16 operator+ to actually work"Xavier Ducrohet2011-08-171-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8313e71fe8b483448d14e22610101c5f3672744': Fix String16 operator+ to actually work
| | | | * | | | | Fix String16 operator+ to actually workJosiah Gaskin2011-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the String16 utility's operator+ function. Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
| | | | * | | | | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-07-271-0/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
| | * | | | | | am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into ↵Xavier Ducrohet2011-06-281-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a': DO NOT MERGE. may fix build on some version of gcc
| | | * | | | | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
| | * | | | | | am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread ↵Mathias Agopian2011-06-151-7/+13
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE) * commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615': fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
| | | * | | | | fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)Mathias Agopian2011-06-131-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4595257 Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
| * | | | | | | am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to ↵Mathias Agopian2011-06-161-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2" (DO NOT MERGE) * commit '48294b0d9388cff632f0e6ae5220305d342c76fb': Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
| | * | | | | | | Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)Mathias Agopian2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also revert all dependent changes: This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461. This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2. This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5. This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8. This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075. This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b. Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
| * | | | | | | | am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a ↵Mathias Agopian2011-06-151-14/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crasher on xoom (DO NOT MERGE) * commit '0887b8c2e583e682cd2c1bc909cb3fdbec704004': revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
| | * | | | | | | revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)Mathias Agopian2011-06-151-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e. Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
| * | | | | | | | am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it ↵Mathias Agopian2011-06-151-0/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncovered a crasher on xoom" * commit 'd5244e0a88ed2f843651aa5ffdc71a45c968e0f3': Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
| | * | | | | | | Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"Mathias Agopian2011-06-151-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16. Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
generated by cgit v1.1 at 2025-08-25 01:16:04 +0000