summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-1/+1
|\ | | | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:45 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * Add bound checks to utf16_to_utf8Sergio Giro2016-07-211-1/+1
| | | | | | | | | | | | | | Test: ran libaapt2_tests64 Bug: 29250543 Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3 (cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
* | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-111-151/+285
|\ \ | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * | DO NOT MERGE: AAPT: Dump uses-permission-sdk-23Adam Lesinski2015-12-161-151/+285
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include <uses-permission-sdk-23> permissions in dump badging and dump permissions. This will also add implied features for that permission, marked as -sdk-23 features. Ex: uses-permission: name='android.permission.ACCESS_FINE_LOCATION' uses-permission-sdk-23: name='android.permission.CAMERA' feature-group: label='' uses-feature: name='android.hardware.location' uses-implied-feature: name='android.hardware.location' reason='...' uses-feature-sdk-23: name='android.hardware.camera' uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...' Bug:24939655 Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3 (cherry picked from commit 5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
* | aapt: Hide "No comment for public symbol" warningsMichael Bestas2016-02-201-2/+2
| | | | | | | | | | | | * Hide these warnings by default behind the kIsDebug flag Change-Id: I56270c5e34bb05a88500eea83879790ad43a814c
* | aapt: add check for untranslatable "string-array"sChirayu Desai2016-01-261-1/+17
| | | | | | | | | | Change-Id: Id884af0505c0bcdfa20b400fcdd54f699f8ef38f Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
* | aapt: Use a std::map instead of a SortedVectorChristopher R. Palmer2016-01-052-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Android's SortedVectorImpl uses arrays that it must insert into the middle of. Each insertion is O(N) time because it must move on average half the elements of the array to make room for the new element. That is, O(N^2) time to build this sorted vector. std::map on the other hand normally uses red/black trees and has a cost of NlogN to add N elements to it. Change-Id: I5da0363ba806ab615b2aad0fb2a43ef9a9bec327
* | aapt: Speed up the style pruningChristopher R. Palmer2016-01-041-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit it removed each style one by one which causes the vector to repeatedly be shrunk and reallocated and copied (aka either quadratic or NlogN in the number of items removed). This commit simply makes it remove them all at once to make it linear instead. Change-Id: I541d151675ab19f37d9de1e7a323104d0d3b3c63
* | aapt: Fix compiler warning (clobbered by longjmp)Christopher R. Palmer2015-11-051-1/+1
| | | | | | | | | | | | | | | | The error handling can clobber the fp variable when the code is being optimized and therefore fp must be marked as volatile to stop it from doing unsafe optimizations. Change-Id: Ib133587687c7fc0e788c4b9673669ef9b5bbe91a
* | AAPT: Build aapt for deviced34d2015-10-271-0/+25
| | | | | | | | Change-Id: I9666cb18120675d65ccdf1c1eba2f4bbf6707041
* | Fix memory leak in AAPTd34d2015-10-271-4/+12
| | | | | | | | | | | | | | Always delete your shit! Change-Id: If14ecedd6cced46c96bbe670b1e337def0a7edf5 REF: CYNGNOS-701
* | Themes: Port to CM13 [1/3]Andy Mast2015-10-2620-158/+908
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Themes: Aapt port Id: I106d447daf7935bada65e78911d8973ce0ca27ae Themes: Port our additions to idmap Id: I2e47cc23de4e7c0b884cccbd87c7d77079ac6824 Themes: remove legacy theme support from idmap Id: I17dfe35f9985d8cef790b26a8bcda738ea65917c Themes: Forward port changes to Installer.java Id: If64e856773e50f5ed74f2358e0c590abad724689 Themes: Add clean spec for aapt Id: I68f5f63f7e83b99230860dd2d8646e96da484b62 androidfw: Port CM overlay contributions Id: Id7b7f5f35011922c668fcea3a8aec5b42bd28653 androidfw: Port addOverlayPath and removeOverlayPath Id: I279db083af28fd8941f3227f2a7512ff094742c1 androidfw: Port addCommonOverlayPath Id: I12d2fe05a04f6a7e553c330505a475346374b507 androidfw: Port addIconPath Id: Ide3db28cde0c7f93edd9e7ad626ebace8d4105cc androidfw: Allow package ID to be overriden at runtime Id: Ieca3a0ae070a6c0ad0cf2b73b5944d83397d08b9 Aapt: Zip Parsing Test Cases w/ Refactoring Id: I28f9115700e186136432138d228111ebcfbd0480 Themes: Update tests for idmap Id: I3dae5bd376d122eab397863378599ae0ac7c6734 androidfw: Add test case for overriding package id Id: I2668c529e24a55cd6bc8437406fc284b853a75e7 androidfw: Add tests for bags The overlayOverridesStyleAttribute will currently fail since our changes to allow theming styles is not currently implemented. Id: Idfacc4382baf4152c839799a22b6cbe015ef2197 androidfw: Don't consider package ids 0x60 and 0x61 as dynamic Package IDs that are not 0x01 (system) or 0x7f (app) are treated as dynamic references. Overlays are assigned specific package ids that fall within the region of shared libraries. This patch treats them the same as system and app resource packages. Id: Ieecaa889bed50490796351302405a38f77c84f4e Theme Parsing & Info Id: I3583d7e8ca704402e3d8c6e1c7cea1645b91c06f Port ThemeUtils and its dependencies This is pretty much copy/paste from cm-11.0 Id: I406860a259136ccca107b981aca0369851df445e Themes: AndroidManifest and Intent port Id: Ib97e8539301d20d120fd8b49891fdaae8205fe42 ComposedIconInfo Port (w/ stubbed IconPackHelper) IconPackHelper is stubbed out so that PMService can reference it, we'll need to port the Resource stack before porting the implementation. Id: I59b680511de525e1d375a4f3be04347686b5e81b Port PackageManagerService and other dependencies Id: I11629d1e5eee21e01c060bc6c0393aae96034b69 Themes: Add in ThemeService See also: external/selinux. The policy must be added in order for the service to start without a security exception. Change-Id: Ic6f64796b264e430e9706a17a3fd2a35085fd1ca TODO: ThemeService / Keyguard interaction TODO: SystemServer - AppsLaunchFailure Add AppsLaunchFailure Id: I09a3826f89c62cb898866408e807f269616f48fc androidfw: Update bags tests The overlayOverridesStyleAttribute was updated such that it does not check the attribute of the theme before adding the overlay. The bag is cached on the first call and the next call, after the overlay is attached, returns that pre-computed bag so the test would always fail. We now simply check that the attribute matches the one in the overlay, and if so then the test passes. This patch also adds a new test to check that an overlay can reference and access resources that are unique to the overlay. Currently this test fails. Id: I3892df3f0d9443a73eaa11b3d5e97cfe86620a73 androidfw: Add test for referencing overlay styles as parents Id: I4fa3bd447c888e96176955924ebe7ee5c784ab55 androidfw: Allow referencing and retrieving overlay resources This patch allows a theme to reference it's own resources. Overlays get their own group which contains those resources that are not idmapped. Idmapped resources end up in the target's group. Id: Ibc119ddcdb35d44a8afec3c6152bcab2909cda18 androidfw: Fill in missing attributes from overlay style Id: I74051b379b73c728c6a2aa4bc62f3cd268a40b53 Protect windowNoTitle and windowActionBar attributes This patch creates a new method to define "protected" attributes. These are attributes like windowActionBar which should not be modified by a theme. Some apps (eg gmail) use the appcompat library which has its own Actionbar classes. When an app uses its own Actionbar it must not include the default actionbar which is achieved through the windowActionBar attribute. Some themes may try to change these attributes, which can will cause the app to crash. Id: Ie3bb7285eed09f3f13facf9d142ea9eb83796eec Themes: Use SYSTEM_DEFAULT in ThemeService Id: I52794dd98ca2f64aa50046ecdd7f79f27c21dd98 androidfw: Test missing parent attributes are merged in This test checks that an overlaid style contains any attributes that were in the original style but omitted in the overlaid style. Id: I6b496ef2eb0a7ef27b4fafdfda5bdf7ccffad989 androidfw: Add test case for protected attributes For this test to pass a protected attribute, such as windowNoTitle, must be equal to the original and not the value specified in the overlay. Id: Ic03f11214a1fc4139e3c48d7e72694a80f819023 Themes: Attach theme and icon resources from java Id: I9ffa0ce96a4af603b78b32d6b190f9698d3e4b4f Themes: Icons, icons, icons! Let there be icons. Legacy icons and composed icons are included in this patch. Id: I9fedafa270f1c4dc30c9c8ffd4cf619895e688e6 Themes: Retrieve explicitly themed context and resources Id: I4e41c251aee47361b183b60089bf5666540f653e Themes: Add themeChange config change to manifest Id: Ia84c0089a79637906e4f75fa38a56e8ff3b21a2b Themes: Register THEME_SERVICE in ContextImpl Id: I608a0b65c7e2ff0d69bae7bf343916f2b985f4a0 Themes: Remove legacy theme support Id: I25887843d31f705425aa40f9a23482fd2cafaef8 androidfw: correctly index paths in idmap Since we added the mtime values for the target and overlay, the indices are increased by two. Id: Ie0f5474d425945d58a12021cd2739240d2e98c0a androidfw: Fix opening assets from theme resources Id: Iedb51163a62b046cdf7fda1ad1b55cc1ee409047 Themes: Consider overlaid resource as "best fit" Id: Ife8342a49eb9502be52f085f88161b113332e9e6 Themes: Save and restore theme config Id: I3fcd445fb458aa6ed09397c05df6eb66d9be7235 Themes: Let ThemeService process additional themes Id: I45837f26948367d5cc6c520e8c53f9da60bd1fda AAPT: Don't applyVersionForCompatibility on android When compiling themes with aapt, we do not want aapt to call applyVersionForCompatibility as this causes the entries in the resource table to have an incorrect path. Id: Ie2c69533b3659c7b7458d6e4b7bdc84946d1be8e androidfw: Don't consider package id 0x5f as dynamic Package id 0x5f is reserved for common overlay resources and needs to be reserved so that it is not considered a dynamic. Id: Id27b8e0e2231ee8541365274d512e347afcfd05b AAPT: Include resources.arsc in apk Common resources needs the resources.arsc in the resources.apk so that it can be included when processing other overlays. Without it, common resources cannot be referenced. Id: I4aee29f660e4a0aa1909240dc0ca5680f0a2d135 Themes: Add keyguard wallpaper support to theme service Id: Ib8f8acd55ab4d2b6ef06ee0a630dc50c4f870beb Themes: Don't pre-process non .9.png images When creating a resources.apk we do not need to pre-process the normal .png images as those can be referenced directly from the theme's apk. Id: Iaf846a03ead9ecb1e68c040eac6e0ecbfc6e5875 Themes: Adjust offsets for idmap hashes Idmap now has a header so the indices to the hashes need to be incremented by one. Id: If1fb183cc116ef9e3ad6cb4e17b6e44763e9e72a Themes: Use single ThemeInfo instead of an array We only ever used the first index so there is no need to use an array of ThemeInfo(s) Id: I9e2af076bc17396a0c978be3c0d31c41277db3df New converter for Kitkat -> L fonts.xml L introduced a new fonts xml format. Its great, but our themes will keep using hte old format. This provides a converter and test cases. The parser was taken from the chooser and remains mostly unchanged with the exception of a getName() helper method. Id: Ia1d42c9e50eb7b52d2d98fe6dbeee530bef3adc2 Themes: Port theme bootanimation support to CM12 Id: Ie016884b0e3b77e08732308923ac44e0975e0116 Resources: Clear drawable cache Id: I04b5b78cce703194a2baeff9c51d2e4733b8ccc9 Font switching Id: Ia43060a7db624102cdcd9b0d9dc7148441401584 Zygote changes Id: Ie3681cf0d2b9929661cf1214e899cef9a5f37471 Recreate String Blocks Id: I4747ebd1a0908b76ae7214b0584948353d426fc5 add a getter for the x and y offsets of the wallpaper window Id: I35294bcac664e85cc5d344b50b5c4335a60d3f37 Themes: Don't spam logcat with CREATING STRING CACHE When processing resources with AAPT on the device, it spams the logcat with warning messages about CREATING STRING CACHE. Change ALOGW to ALOGV so it will only show when verbose logging is enabled. Id: I5b591c3336e176dd71cebe672d60721c29651b00 SystemUI: Audio Volume Panel Id: I78c471864af401b274597339b8451e65931fdb32 AmService uiContext port Id: Ida251d7f80797b0ec78b3d20cf60a795d6c4c1f0 Cleanly detach theme assets Types from an overlay are added to the target group's TypeList and need to be removed when the overlay assets are detached. Failing to remove these types results in resources not being retieved due to the erroneous types. Id: I4a9c624e30309e61fce905ced45c55acd3ac4845 Themes: GlobalAction Port Id: Ifd87e04f94a284e77f1c48bec9fd75d69c45c47e Themes: Do not store forward locked themes in ASEC containers If a theme is in a asec container and is applied, when the device is rebooted the device will get stuck in a nasty boot loop since the theme resources must be read and the asec container is not ready yet. Id: I1d93d8175d5c40b34c222974960c43352012a5ad Use systemui's applied theme for notifications. Notifications contain RemoteViews which are inflated using the application's context for which this notification belongs to. This can look out of place if SystemUI is using a different theme than the rest of the system. This patch will use SystemUIs theme when inflating the RemoteViews, giving us a more consistent look in the notification drawer. Id: I9514ce7fcc4858bad3d3c4190f55c1f5a1441d7c SysUI: Add theme support This ports over the changes needed to facilitate a theme change in SystemUI. Id: I673fb79db90994371a9c0627746a97414132f0ba Themes: Allow composing of VectorDrawable Base icons can be vector drawables. This patch allows them to be composed. Currently, VectorDrawables cannot have filters applied since they do not have a method to get the Paint object like BitmapDrawable and PaintDrawable. Id: I762c8e1f4d1c945b8ebc164bbd7944120324bd42 Themes: Add target api to ThemesContract This will allow the ThemesProvider to track the api a theme was built for. We may want to let the user know when a theme may not be designed for the version of CM installed on their device. Id: Idf0e6cef0ce9ac5e221ce5ff7e0b155ae0258d5f Access Themed ResTables from compiled theme apk [1/2] Before this patch the ResTable for a theme/app was created and accessed seperate from the compiled APK. Since the compiled APK has its own copy of the resources.arsc, we can just reuse the table in the APK instead. Id: I106a2434e74784bc04014831098f49fe128bc7e2 Themes: Port AppsLaunchFailureReceiver to CM12 Id: I5c3265e64aef1536ba5fceed0ec89082e786b686 Themes: Bump idmap hash version to 3 Due to changes in idmap, we need to force the recreation of resource cache when upgrading from CM11 to CM12. Id: I25c1e2c598bca889818e2d685651e3214c30ab3c Remove debug logs Id: Ia5cfa83ddf6da195e20526a94ba154864b8d0ecb Send target sdk version to aapt [1/2] If vector drawables are used in a theme we must have a minSdkVersion of 21 passed to aapt or else aapt will Segfault. Id: I687ee146f9f80543bbcdd06d93891cb3b23001c4 Add missing imports to ActivityThread Id: I09fe07807ed824ccb938e0e174b06653c613c403 Themes: Dynamically add/remove content from StatusBarWindow StatusBarWindowView has logic for resizing and fading content which doesn't always behave correctly if this view is not the root. Rather than create a container, this patch uses the existing StatusBarWindowView as the container and the inflated status bar is then added to this view. Id: Ia93d25a589419145f95d75b1b56eb3c2f300f935 Themes: don't use preloaded drawables when themed If we have themed assets we should try and load those rather than pulling from the preloaded drawables. This allows us to continue and preload drawables in ZygoteInit while maintaining the ability to theme those preloaded assets. Id: I68cfc099d328ece0791b6d0e5cf11d07097fd1fd CM11 -> CM12 Upgrade [1/3] - Introduce a new secure setting "THEME_PREV_BOOT_API_LEVEL". This field will always be set to the previous api level for themes. So if we upgrade from CM11 to CM12 this value will differ from the current API causing an upgrade to trigger - When moving from CM11 -> CM12, unapply incompatible overlays - Rename "holo" to "system" in secure settings themeConfig - Provide a testing downgrade script to put the secure settings db into a state similiar to CM11 (at least for themes) Id: I71be2c0ad83e60ffe8c574f913e5eaecb9700045 Themes: Add constant for system target API Id: I0a6caf65c9e8b0feeef1ae848ba4683235304e8c Change-Id: Ide6d4e1daf535a54efb1ec7cf39ef8b2fb8cf272
* | androidfw: Declare and load cmsdk resource package w/ id.Adnan Begovic2015-10-121-2/+3
|/ | | | Change-Id: I63b8f3e4a938896dd21999c5b4470573a1da2e52
* AAPT: Fix regression in resource versioningAdam Lesinski2015-08-144-19/+94
| | | | | | | | | | | | With a set of resources with the following configurations: () (land) the regression caused any resources that needed to be versioned in configuration () to be lost. Bug:23038206 Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa
* AAPT: Fix resource versioningAdam Lesinski2015-07-281-18/+52
| | | | | | | | | | | Resource generation was greedy, so when an attribute with sdk level 21 was used in a resource with v1, and a different attribute with sdk level 21 was used in a resource with v11, a v21 resource would be synthesized, but it would contain the attribute from v1 instead of v11. This change fixes the issue, having the higher versioned resource take precedence. Bug:22793816 Change-Id: Ia687f56b0d9969e424111477d55d9804255b22e9
* ICU format support for pseudolocalizes.Igor Viarheichyk2015-06-255-67/+419
| | | | | | | | | | | | | | | Custom parser can handle nested ICU messages even if they are split into multiple fragments. Code reworked to encapsulate all pseudolocalization logic in Pseudolocalizer and PseudoMethods classes. To minimize a changelist size, some static functions remained. Fake BiDi pseudolocalization method is reimplemented to handle word boundaries correctly. Unit tests added. (cherry picked from commit cbb1e676b56677ae3585c067f29646dddffb4857) bug: 22060509 Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
* aapt: add option for stricter symbol generationAdrian Roos2015-06-025-3/+49
| | | | | | | | Adds an option that prevents generating java symbols for string resources that don't have a default localization. Bug: 21537397 Change-Id: Ifafa942b24d5cdbed93651cde363e859be13d395
* Add -round and -notround qualifier to android runtime/aaptAdam Lesinski2015-05-154-1/+48
| | | | | | | | The round qualifier denotes a device with a screen shape that is round. The qualifier shows up after the 'long/notlong' qualifier and before the orientation 'port/land/square' qualifiers. Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
* Remove unused aapt target.Chih-Hung Hsieh2015-05-061-24/+0
| | | | | | | BUG: 20765163 Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8 (cherry picked from AOSP commit 97627314a4d3e114afe3dbd764a51523e9f0b787)
* am 815d9bb1: Merge "Add a static dependency on libbase."Narayan Kamath2015-04-291-1/+2
|\ | | | | | | | | * commit '815d9bb178a0488ed1579cd230d447630ad0891b': Add a static dependency on libbase.
| * Add a static dependency on libbase.Narayan Kamath2015-04-291-1/+2
| | | | | | | | | | | | Used by libziparchive. Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
* | AAPT: Add flag to disable versioning of vector related XMLAdam Lesinski2015-04-213-4/+20
| | | | | | | | | | | | | | | | | | | | | | AAPT automatically versions XML files according to the SDK level in which their attributes were introduced. Support libraries know how to handle resources built against newer SDKs, so offer the option to disable some of the automatic versioning, namely vectors. Bug:19336994 Change-Id: I9f9d0ae8f2a0c28404f82e27de416f80e38493c9
* | am 106f83ee: am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror ↵Colin Cross2015-04-094-5/+2
|\ \ | |/ | | | | | | | | | | that were lost in a merge" * commit '106f83ee9cc145a6421d21067c44b513cc148e80': Re-enable -Wall and -Werror that were lost in a merge
| * Merge "Re-enable -Wall and -Werror that were lost in a merge"Colin Cross2015-04-094-5/+2
| |\
| | * Re-enable -Wall and -Werror that were lost in a mergeColin Cross2015-04-084-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | -Wall and -Werror were lost during a merge when they were added to aaptCFLAGS instead of aaptCFlags. Fix the typo, and the warnings that crept in while it was disabled. Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
* | | am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."Elliott Hughes2015-04-034-4/+4
|\ \ \ | |/ / | | | | | | | | | * commit '66d9451273c4a3775b6b63a0e4b7027bd2eae65d': Only Windows doesn't have %zd.
| * | Only Windows doesn't have %zd.Elliott Hughes2015-04-034-4/+4
| |/ | | | | | | Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
* | Merge "Output modified bcp47 tag in ResTable_config::toString()"Adam Lesinski2015-03-203-30/+1
|\ \
| * | Output modified bcp47 tag in ResTable_config::toString()Adam Lesinski2015-03-163-30/+1
| | | | | | | | | | | | | | | | | | | | | We expect to be able to parse the output of ResTable_config::toString(), so it should use modified bcp47 (b+en+Latn+US). Change-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722
* | | am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp."Elliott Hughes2015-03-191-127/+0
|\ \ \ | | |/ | |/| | | | | | | * commit '0634fba5915073e5b46e24f0ba0d5bbc44c922a5': Remove unused printapk.cpp.
| * | Remove unused printapk.cpp.Elliott Hughes2015-03-191-127/+0
| | | | | | | | | | | | | | | | | | | | | This is one of the few remaining users of libzipfile, but doesn't get built. Not worth porting to libziparchive. Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c
* | | Handle malformed manifests in printXMLBlockVishwath Mohan2015-03-121-14/+22
| |/ |/| | | | | | | | | | | | | | | | | Specially crafted manifest files can cause a segfault in printXMLBlock() using improper tag nesting (without evaluating to ResXMLTree::BAD_DOCUMENT). This fix checks and breaks when this condition is detected. Bug: 15549617 Change-Id: I27997fda86d228e993217a0c09993bff404cf317
* | am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to ↵Dan Albert2015-03-053-26/+19
|\ \ | |/ | | | | | | | | | | stage-aosp-master * commit '7a79c4cac3b0c722832e868346db2375b6d6c379': Stop using namespace std.
| * resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| |\ | | | | | | | | | Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
| | * Stop using namespace std.Dan Albert2015-03-043-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern of #include and using namespace std here fails to build with GCC. At first glance it's a GCC bug rather than libc++ doing something wrong. Regardless, it can be worked around by just specifying std:: where appropriate. Bug: 19606303 Change-Id: I5652682eae7ca7559cf2a9307909859013440781
* | | Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."Narayan Kamath2015-02-112-1/+8
|\ \ \ | |/ / |/| |
| * | Parse res-car as resources for UI_MODE_TYPE_CAR..Narayan Kamath2015-02-102-1/+8
| | | | | | | | | | | | | | | | | | | | | .. and not a 3 letter language code. bug: 19291216 Change-Id: I01bf76d89880693dcdb4384d5c239902fa3defa8
* | | am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into ↵Chris Warrington2015-02-101-15/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 4499888 * commit '449988872be61f273c91db13069d5b7172429032': Fix AAPT daemon mode with paths containg spaces.
| * | Fix AAPT daemon mode with paths containg spaces.Chris Warrington2015-02-091-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | Use new line as a delimiter rather than space. Fixes: https://code.google.com/p/android/issues/detail?id=135757 Gradle CL: https://android-review.googlesource.com/130423 Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
* | | Merge "AAPT: Use the right enum when checking for density configurations" ↵Adam Lesinski2015-01-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: b443610 automerge: 83f58a2 * commit '83f58a2f7afac98199536b3090fe6f767ffb3a0d': AAPT: Use the right enum when checking for density configurations
| * | AAPT: Use the right enum when checking for density configurationsAdam Lesinski2015-01-221-1/+1
| | | | | | | | | | | | | | | Bug:19116675 Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
* | | am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute ↵Adam Lesinski2015-01-143-48/+127
|\ \ \ | |/ / | | | | | | | | | | | | | | | usage" into lmp-mr1-dev * commit 'e488ce8668538b45c586eba21f5bca288d749686': AAPT: Handle all old unversioned attribute usage
| * | AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-143-48/+127
| | | | | | | | | | | | | | | | | | | | | | | | All references to attributes defined in pre-LOLLIPOP_MR1 SDK are moved to version qualified resource entries. Bug:18221682 Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
* | | am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0Adam Lesinski2015-01-081-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2': Fixup aapt usage message
| * | Fixup aapt usage messageJohan Redestig2015-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The --preferred-configurations option was renamed to --preferred-density in fab5087 but only part of the usage message was changed. Change-Id: I89d270990023beca19605901d956d29d0b0b848b
| * | Add appropriate casts for char16_t.Dan Albert2014-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | C++11 defines a real char16_t, which is not implicitly convertible to uint16_t (and by extension jchar). Add casts as needed. Bug: 18300613 Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
* | | am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" ↵Adam Lesinski2014-12-162-0/+16
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into lmp-mr1-dev * commit '503a4494d64d30f9b904b24a56fff986810da610': AAPT: Copy android:revisionCode to Splits
| * | Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-devAdam Lesinski2014-12-162-0/+16
| |\ \
| | * | AAPT: Copy android:revisionCode to SplitsAdam Lesinski2014-12-162-0/+16
| | | | | | | | | | | | | | | | | | | | Bug:18706179 Change-Id: I669b56e0b67dd1bfda7749ef433b55af16851154
* | | | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would ↵Adam Lesinski2014-12-161-25/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | be removed for pre-21 devices" into lmp-mr1-dev automerge: 465d123 * commit '465d123464eadf180b618164b2ed23702bca3d86': AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
generated by cgit v1.1 at 2024-05-22 01:34:58 +0000