summaryrefslogtreecommitdiffstats
path: root/tools/aapt/AaptAssets.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resourcesFabrice Di Meglio2012-09-061-2/+2
| | | | | | | | | | | | - we cannot use "rtl" / "ltr" qualifiers as they can conflict with ISO-639 Alpha-3 codespace which uses 3 letters for identifying a language code (and could use either "rtl" or "ltr" strings for defining a language in the future). - we are using instead "ldrtl" for RTL and "ldltr" for LTR resources. Those qualifiers are defined by more than 3 chars and outside of what is defined into ISO-639. They are also more understandable as "ld" prefix is for "layoutdirection" Change-Id: Id43e948103707e09bef63ebd54ac1779dde58e72
* Add support for "-rtl" in resourcesFabrice Di Meglio2012-08-231-1/+55
| | | | | | - fix bug #7035019 Need to have "-rtl" support for Resource Change-Id: Ic82145c2ac672729d8a6c695a5f343276a1a0a2c
* am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
|\ | | | | | | | | * commit '44ff9b8f9294e015031fc9293974604771e5efdd': Tweak default ignore-assets path
| * am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
| |\ | | | | | | | | | | | | * commit '36ac43ba9982a78b4a047c8970776505a3fab4da': Tweak default ignore-assets path
| | * Tweak default ignore-assets pathTor Norbye2012-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .DS_Store to the list of ignored files that are silently ignored (other dot-files are ignored but aapt emits a "(skipping <x>)" message.) Also, add a "!" prefix to the *~ pattern for Emacs/Vim/Gedit backup files. Finally, move the !*.scc pattern up in front of the .* pattern, such that it doesn't match the earlier .* pattern (which is verbose, unlike !*.scc). Change-Id: Id3e96490f1802486aea8c58366d43e9d413971b8
| | * Merge "Fix length of pattern." DO NOT MERGE.Ying Wang2012-05-241-0/+1
| |/ | | | | | | | | | | | | | | | | After skipping * with "token++", the length should decrease by 1 as well. (merged from 996b073e813ba1a22a13282ccdebb664f14ba898) Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
| * Support a new ANDROID_AAPT_IGNORE env var.Raphael Moll2012-05-091-43/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT has a fixed built-in list of files and directories to ignore when parsing resource files. Over the years we always had developers requiring specific patterns. If the env var ANDROID_AAPT_IGNORE is set, it is parsed to find which file/directory patterns to ignore. Otherwise a default is used that matches the current behavior. Added a command-line option for it: aapt di --ignore-assets "foo*:*.blah" SDK Bug: 5343 24067 Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
* | Fix length of pattern.Ying Wang2012-05-221-0/+1
| | | | | | | | | | | | | | After skipping * with "token++", the length should decrease by 1 as well. Change-Id: I132eb7d12bb756f2f713c607e92741ca834aef81
* | Merge "AAPT: support a new --ignore-assets flag."Raphael Moll2012-05-181-43/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT has a fixed built-in list of files and directories to ignore when parsing resource files. Over the years we always had developers requiring specific patterns. Added a command-line option for it: aapt di --ignore-assets "foo*:*.blah" If the env var ANDROID_AAPT_IGNORE is set, it is parsed to find which file/directory patterns to ignore. Otherwise a default is used that matches the current behavior. SDK Bug: 5343 24067 (cherry-pick from AOSP 90897ed87bce639bf6bb2ccf15fbabb59b131bab) Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
* | Only generate private symbols that are needed.Dianne Hackborn2012-02-071-0/+85
| | | | | | | | Change-Id: Icc4c86638db8429a387bf87c934cc712f807e213
* | Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.Dianne Hackborn2012-01-251-3/+8
| | | | | | | | Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
* | Add a new ui mode for "appliance"Joe Onorato2011-12-151-0/+5
|/ | | | | | | | The idea is that this is a device which is more-or-less headless. It might have some limited interaction capabilities, but it's not something that you want to rely on having. Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
* Whoops, remove left-over debug output.Dianne Hackborn2011-10-161-1/+1
| | | | Change-Id: Ib30571b22a6750629f975319a403d38de5e9462c
* New aapt feature to do smarter filtering of configurations.Dianne Hackborn2011-10-161-77/+338
| | | | | | | | | | | | | | | | | | | This adds a --preferred-configurations flag that specifies the specific configurations you would like to have. It is smarter than "-c" because it will avoid stripping a configuration if that would result in there being no value for the resource. It is dumber than "-c" because it can't process as many kinds of resources. It is really only intended for bitmaps and use with density configs. This required re-arranging AaptAssets to group files together by config again, like they used to be. I think this hasn't broken anything. Hopefully. Change-Id: I4e9d12ff6e6dbd1abb8fd4cb1814c6674b19d0e5
* resolved conflicts for merge of 2c311be7 to honeycomb-plus-aospXavier Ducrohet2011-07-201-2/+2
|\ | | | | | | Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
| * Add generation of dependency file for .ap_ packageJosiah Gaskin2011-07-181-2/+2
| | | | | | | | | | | | | | | | | | Make Aapt generate a dependency file in the same directory as the output ap_ file if the --generate-dependencies flag is set. This dependency file can then be read by the ant exec loop task to see whether to repackage resources. Change-Id: I763679414daf76369700aa599c26dcf78d4de099
* | am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to ↵Xavier Ducrohet2011-07-191-10/+17
|\ \ | |/ | | | | | | | | | | Aapt for R.java" * commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7': Add dependency generation to Aapt for R.java
| * Add dependency generation to Aapt for R.javaJosiah Gaskin2011-06-271-10/+17
| | | | | | | | | | | | | | | | | | Make Aapt generate a dependency file in the location specified by RClassDir for R.java if the --generate-dependencies flag is set. This dependency file is then read by the ant exec loop task to see whether to recreate R.java. Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
* | Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+5
| | | | | | | | Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
* | Add "television" mode.Dianne Hackborn2011-05-231-0/+5
| | | | | | | | Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
* | Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-39/+93
| | | | | | | | Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
* | DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-121-6/+109
|/ | | | | | | | | | | | | | | | You can now specify resource configuration variants "wNNNdp" and "hNNNdp". These are the minimum screen width/height in "dp" units. This allows you to do things like have your app adjust its layout based only on the about of horizontal space available. This introduces a new configuration change flag for screen size. Note that this configuration change happens each time the orientation changes. Applications often say they handle the orientation change to avoid being restarted at a screen rotation, and this will now cause them to be restarted. To address this, we assume the app can handle this new config change if its target SDK version is < ICS. Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
* Make AaptGroupEntry::getMncName accept mnc00Johan Redestig2011-01-041-5/+3
| | | | | | | | | | | | | | MNC 00 is a valid network code and is used by some operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code. Remove the test that checks if atoi returns zero. The string is validated to contain only numbers already. Also discussed here: https://code.google.com/p/android/issues/detail?id=3657 Change-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7
* Add --max-res-version flag to aapt.Ficus Kirkpatrick2010-08-131-0/+10
| | | | | | | | | | aapt will ignore any versioned resource directories over the specified version (if used). e.g. --max-res-version=6 will cause layout-land-v7 to be ignored. Merged from froyo. Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb
* am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-061-0/+5
|\ | | | | | | | | | | | | Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken * commit '5474902fe9fe72c825855c4a77f99a581a9f6594': xhdpi
| * xhdpiDianne Hackborn2010-06-041-0/+5
| | | | | | | | | | | | This is only a tool (aapt) change, and does not impact any current code. Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840
* | New xlarge screen size.Dianne Hackborn2010-04-281-0/+5
|/ | | | | | | | | | | | | Not complete, only for experimentation at this point. This includes a reworking of how screen size configurations are matched, so that if you are on a larger screen we can select configurations for smaller screens if there aren't any exactly matching the current screen. The screen size at which we switch to xlarge has been arbitrarily chosen; the compatibility behavior has not yet been defined. Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
* Refactor car mode.Dianne Hackborn2010-03-051-1/+6
| | | | | | | | | | | | | | | | | | Extract all UI behavior from dock observer and ACTION_DOCK_EVENT. Also introduce a desk type to go along with the car type all through the resource system, since we now need to have corresponding high-level broadcasts for desk dock mode. As part of that I also reworked some of the logic for switching modes to all funnel through a single update() call that looks all of the current state to decide what to do next, and fixed various locking issues. In addition I found there were bugs in the configuration change handling causing us to only switch into the car mode config and then never get out of it. Unfortunately now that we are actually changing the configuration for each mode change, the transitions between them are really crummy as we restart all kinds of activities. :(
* Fix issue #2448075: aapt doesn't fix up activity-alias ↵Dianne Hackborn2010-03-011-0/+20
| | | | | | | | | | | | | | android:targetActivity links And related: - The aapt tool now sets a resource configurations sdk level to match any configs that have been set (for example if you specify density your sdk level will be at least 4). - New option to modify the targetPackage attribute of instrumentation. - Clean up of aapt options help. - Fix of UI type values to leave 0 for "unspecified". - Make the UI mode config APIs public.
* Use direct reference to enum in AaptAssetsKenny Root2010-02-191-6/+6
| | | | | | | The second argument to the getNavHiddenName can be NULL, so use a direct reference to the class to get the enum values instead of the argument. Change-Id: I0444572c23cb4de9e7da15a8310a49cf4619bb15
* Fix enum referenceKenny Root2010-02-181-8/+8
| | | | | | | | Was using argument that is set default to NULL as a shortcut to an enum's value. Change it to reference to class directly to avoid a null pointer dereference. Change-Id: I16b8ee15af4f095f027113131d574b70768994b0
* Introduce special UI modes for night and car usage.Tobias Haamel2010-02-111-0/+100
| | | | | | | | | | | | | | | | | | The device mode is now called ui mode. Furthermore is the order of precedence for the resources now in such a way that the ui mode needs to be specified after the orientation and before the density. The ui mode can be set, like it is done for the locale, as follows: IActivityManager am = ActivityManagerNative.getDefault(); Configuration config = am.getConfiguration(); config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY; am.updateConfiguration(config); To allow users to disable the car mode and set the night mode the IUiModeManager interface is used. The automatic night mode switching will be added in a separate change.
* AAPT: Ignore visual source safe files in resourcesRaphael2009-09-241-0/+4
| | | | BUG 1895888
* Implement issue #1780928: Need support hiding nav keys.Dianne Hackborn2009-09-151-1/+54
| | | | | | | | | | | | | This implements support for devices whose hardware can hide their navigation keys. It works much like the existing keyboardHidden configuration, and for compatibility uses the same configuration change bit. Also add FLAG_TURN_ON_SCREEN for windows, which has the system cause the screen to be turned on when the window is displayed. Great fun when used with FLAG_SHOW_WHEN_LOCKED! Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
* Add a flag (-G) to aapt to have it output the classes that shouldn't be ↵Joe Onorato2009-08-301-0/+13
| | | | obfuscated by ProGuard.
* First pass at reworking screen density/size APIs.Dianne Hackborn2009-07-211-49/+124
| | | | | | | | This changes the names of the directories in aapt, to what you see in the list of DpiTest resources. Also adds a new "long" configuration for wide screens, which the platform sets appropriate, and introduces a new kind of resizeability for not large but significantly larger than normal screens which may have compatibility issues.
* Add "nodpi" density, and expose a bunch of density-related APIs.Dianne Hackborn2009-07-171-1/+7
| | | | | Also update the DpiTest app to use nodpi images, and try to have a mode where it turns off compatibility though it's not quite working.
* Expand support for different screen sizes.Dianne Hackborn2009-06-261-1/+49
| | | | | | | | | Applications can now declare that they support small, normal, or large screens. Resource selection can also be done based on these sizes. By default, pre-Donut apps are false for small and large, and Donut or later apps are assumed to support all sizes. In either case they can use <supports-screens> in their manifest to declare what they actually support.
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+1717
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-1717/+0
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-65/+71
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-1/+4
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+1708
generated by cgit v1.1 at 2025-11-27 08:55:26 +0000