History log of /frameworks/base/tools/aapt/ResourceTable.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
407f625a9b8e356e765a5ec587c443af1f3aadb5 04-Oct-2010 Dianne Hackborn <hackbod@google.com> Add new API to find out whether external storage is removable.

This is implemented based on whether we are using the "nosdcard"
product. Needed to tweak aapt to allow use of the product attribute
with other resource definition tags besides strings.

Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
/frameworks/base/tools/aapt/ResourceTable.cpp
90964040cabfc67f92a7c3322a02401bb6f8ae82 16-Sep-2010 Eric Fischer <enf@google.com> Add an aapt option to allow string variations for different devices.

The --product option to aapt is a comma-separated list of characteristics
of the device being built for. For example, --product nosdcard,grayscale
for a device with no SD card and a grayscale screen.

Strings can specify a product="characteristic" option to cause that version
of the string to be used only for that type of device. All such strings
should also specify, at the end of the block, product="default", which
will be used if none of the variations match. For example:

<string name="choose" product="bw">Choose black or white</string>
<string name="choose" product="grayscale">Choose a shade of gray</string>
<string name="choose" product="default">Choose a color</string>

The default characteristic will also be used when no --product option
is specified.

Change-Id: Ie6c1505599e02e15b7818e8be6ec47bc6ce71aaa
/frameworks/base/tools/aapt/ResourceTable.cpp
15fe2cb73b0770316db302f6502f568062d68e74 29-May-2010 Kenny Root <kroot@google.com> Add error checking for translatable strings

Translatable strings that have multiple substitutions should use
positional String.format() substitutions. This change makes it an error
not to use that format on translatable strings that have more than one
substitution in its text.

Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916
/frameworks/base/tools/aapt/ResourceTable.cpp
c9f3088036dd7cce6903e307afea3e289a334036 24-Mar-2010 Kenny Root <kroot@google.com> Use correct API version for UTF-8 checking

Use the constant for checking the API version in aapt instead of a bare
number.

Bug: 2541326
Change-Id: Ice7af7b393363a00f1832dd84753b8138d057fb4
/frameworks/base/tools/aapt/ResourceTable.cpp
1741cd4904414b5b4e768953a8f1abb3f0ef0a0a 18-Mar-2010 Kenny Root <kroot@google.com> Fix minSdkVersion scanning to not throw warnings

For the UTF8/UTF16 switch code, we needed to know what was the
minSdkVersion specified as early as possible. Unfortunately, this threw
warnings when the SDK was compiling since we always set this field in
the Bundle.

This splits out the field used by the initial AndroidManifest.xml scan
to a separate one that we won't attempt to re-insert into the
AndroidManifest.xml This also switches the logic to better reflect the
preference of UTF-8 over UTF-16; previously UTF-16 was the default.

Change-Id: Ia81f6b21047043ebb711eb24c2c3718534979ef6
/frameworks/base/tools/aapt/ResourceTable.cpp
774562275fa76681933a0105ed61c672892b23bd 10-Mar-2010 Kenny Root <kroot@google.com> Revert "Dedupe resource config pointers"

This reverts commit 7b467d8b44c00d14590c021928b6a9ad5a36348e.
/frameworks/base/tools/aapt/ResourceTable.cpp
7b467d8b44c00d14590c021928b6a9ad5a36348e 10-Mar-2010 Kenny Root <kroot@google.com> Dedupe resource config pointers

When there are two configs in a StringPool that would match a string ID
only keep the more generic entry to save some space. This means that if
you have both "es" and "es_US" translations that have the same
translation, the string entry would be removed from the "es_US" config.

Change-Id: I4d619942d35ddb477e2eabe4437b7f02697c24de
/frameworks/base/tools/aapt/ResourceTable.cpp
cf244ada58539ce857ec041d7288d0271204fbb6 10-Mar-2010 Dianne Hackborn <hackbod@google.com> Add ability for some manifest attributes to reference resources.

This loosens our restriction on many manifest attributes requiring
literal string values, to allow various ones to use values from
resources. This is only allowed if the resource value does not change
from configuration changes, and the restriction is still in place
for attributes that are core to security (requesting permissions) or
market operation (used libraries and features etc).

Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
/frameworks/base/tools/aapt/ResourceTable.cpp
65e185b51ec655518f1917418cd6192400ac439d 05-Mar-2010 Ed Heyl <edheyl@google.com> Change an aapt "warning" from "*** " to "**** " (from three to four stars).
"*** " (three stars and a space) is the 'magic make error string'; so this change makes it
easier to find the real issues/errors in build logs. Besides, other aapt messages are "**** ".
/frameworks/base/tools/aapt/ResourceTable.cpp
f5a7c121dd3abb9763c30115c772fd1fc03caea2 18-Feb-2010 Kenny Root <kroot@google.com> Change buf size holding integer in ResourceTable

A 32-bit integer can be 10 characters long plus a byte for \0 at the
end.

Change-Id: I58040fe6e1674e78bcc6e07463ff36fb26e280f4
/frameworks/base/tools/aapt/ResourceTable.cpp
27b28b3f62bd3b54fa13acd5d035940b9be464f3 09-Feb-2010 Tobias Haamel <haamel@google.com> Introduce special UI modes for night and car usage.

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.
/frameworks/base/tools/aapt/ResourceTable.cpp
99080c7d9ad9e5ccfec70dd10e4c24468a960c45 05-Feb-2010 Xavier Ducrohet <xav@android.com> Add --auto-add-overlay option to aapt.

This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>

Change-Id: Iff782311056f6a045193e57d204f7d3413e11b26
/frameworks/base/tools/aapt/ResourceTable.cpp
19138468caf7050d482dc15f35a344eab11bb756 04-Dec-2009 Kenny Root <kroot@google.com> Optional use of UTF-8 strings in resource bundles

Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.

When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.

Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
/frameworks/base/tools/aapt/ResourceTable.cpp
59ad275e937bb3c32e59bc01d86f484e7b4bdbe1 04-Nov-2009 Dirk Dougherty <ddougherty@google.com> doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.

Bug: 2230588
Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
/frameworks/base/tools/aapt/ResourceTable.cpp
93d72516994277acdd3894a169ec1f1cbc50db97 03-Sep-2009 Robert Greenwalt <robdroid@android.com> Fix compilation of add-resource tag.

It used the wrong tag-type to find the end of itself.
/frameworks/base/tools/aapt/ResourceTable.cpp
c87d25215c842cea370c6a86ce67585fa8da4900 02-Sep-2009 Eric Fischer <enf@google.com> Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.

In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing. Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation. (And fix a recently-introduced string
that has exactly this problem.)

Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.

Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
/frameworks/base/tools/aapt/ResourceTable.cpp
58c27a0a03f573791935116fa35f6a7c8bf93896 13-Aug-2009 Dianne Hackborn <hackbod@google.com> Allow overlays to add resources.
/frameworks/base/tools/aapt/ResourceTable.cpp
dd931864209eac0b4182d7a0d1ca965fcc3b8c03 13-Jul-2009 Marco Nelissen <marcone@google.com> Format aapt warnings the same way as other compiler warnings
('warning: ' instead of 'WARNING: ' or 'WARNING ')
/frameworks/base/tools/aapt/ResourceTable.cpp
f878e2d80c3a0afefe3b018d232df6066379e1d5 09-Jun-2009 Robert Greenwalt <robdroid@android.com> Make aapt Error out when an overlay adds a string.

Final added check (I think) for 1585775 - not letting overlays add
resources.

modified: ResourceTable.cpp
modified: ResourceTable.h
/frameworks/base/tools/aapt/ResourceTable.cpp
1aa8170e6a448afad86e5d62927d3b8ca4cd9707 06-Jun-2009 Robert Greenwalt <robdroid@android.com> Add per-named-item overlay ability in res xml.

Fixes 1899451.
Also errors out if you add a bag via an overlay (which would renumber
resources). Note that you can still add elements within the bag as they are
not issued resource IDs. So for example you can now modify the framework
themes.xml file without copying the entire file.

All bag types are now modifable except non-named bag types (how would you
address which element to replace?):
array
string_array
integer_array
/frameworks/base/tools/aapt/ResourceTable.cpp
f479aa0900e9a85afdc78b1048684e37579ebf23 21-May-2009 Dianne Hackborn <hackbod@google.com> Add padding to public.xml to avoid breaking from auto-merges.
/frameworks/base/tools/aapt/ResourceTable.cpp
a96cbb435d7b2197ab2b61fd98d14cbd6e0c5c3d 14-May-2009 Dianne Hackborn <hackbod@google.com> Implement compatibility support for WRITE_SDCARD permission.

Now old applications will automatically be granted it. Also renamed it from
SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions,
and re-arranged how we do targetSdkVersion to actually be usuable for this
kind of stuff.

Note that right now this results in basically all apps being given the
WRITE_SDCARD permission, because their targetSdkVersion is not set. I will
be dealing with that in a future change.
/frameworks/base/tools/aapt/ResourceTable.cpp
32c2c902200e894c6e887218a337334d81013be5 08-May-2009 Robert Greenwalt <robdroid@android.com> Fix 1840639 to support overlays with zz_ZZ.
Everything but strings worked fine before but a new default string would generate a build error.
/frameworks/base/tools/aapt/ResourceTable.cpp
9411a39866b749ad0a47f15083f311847eb79178 04-Apr-2009 Robert Greenwalt <> AI 144547: Fix change 144342 by making it active only during overlay processing.
BUG=1754390

Automated import of CL 144547
/frameworks/base/tools/aapt/ResourceTable.cpp
4b4f4a908895bc0ba63f929bfdc02eec22c0f6e5 03-Apr-2009 Robert Greenwalt <> AI 144342: Fix bag (string-array,etc) behavior with overlays.
We used to replace elements in the default with elements from
the overlay. This change causes us to empty the array first
so if the overlay array is smaller we don't end up with elements
from the default array showing through at the end of the array.
Ex: [A,B,C] and overlay [D] should give [D] but used to give
[D,B,C].
BUG=1754390

Automated import of CL 144342
/frameworks/base/tools/aapt/ResourceTable.cpp
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/ResourceTable.cpp
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/ResourceTable.cpp
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
/frameworks/base/tools/aapt/ResourceTable.cpp
22f7dfd23490a3de2f21ff96949ba47003aac8f8 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
/frameworks/base/tools/aapt/ResourceTable.cpp
9266c558bf1d21ff647525ff99f7dadbca417309 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
/frameworks/base/tools/aapt/ResourceTable.cpp
b798689749c64baba81f02e10cf2157c747d6b46 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
/frameworks/base/tools/aapt/ResourceTable.cpp
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/frameworks/base/tools/aapt/ResourceTable.cpp
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/frameworks/base/tools/aapt/ResourceTable.cpp