| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
It used the wrong tag-type to find the end of itself.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
| |
Aapt was adding/removing elements from a list an continuing to use a stale copy for future indexes.
This could cause incorrect subsequent processing. Add an en resource and modify an es, for example.
Adding the en would cause the base fileset's es version to be moved in the list. Using the old index
we'd then attempt to remove the old es version with the wrong index and then add the new es version
generating a "duplicate file" error.
bug: 2090015
|
| |
|
|
|
|
| |
obfuscated by ProGuard.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This introduces a new mechanism to define features associated with
a platform, query the current device for the available features,
and enforce that apps requiring features that aren't available can't
be installed.
Also now allows uses-library to specify that a library is optional,
so the lack of such a library will not prevent the app from being
installed (but if it does exist it will be correctly linked into
the app).
Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
scanning
Add new manifest/aapt support for specifying device features an application
requires. The aapt badging now returns these (as well as uses-permission since
I need to look for those anyway); if an app doesn't explicitly request the
camera feature but does request the permission, then aapt will say that it has
requested both the basic camera feature as well as the autofocus feature.
Here's what you put in your manifest to say you need a camera but don't need
autofocus:
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
Here's what will be seen from aapt:
uses-permission:'android.permission.CAMERA'
uses-feature:'android.hardware.camera'
uses-feature-not-required:'android.hardware.camera.autofocus'
Change-Id: I4dd19cee0486cc54771f5bf14fc9db0e892115d5
|
|
|
|
| |
Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
|
|
|
|
|
|
|
|
| |
receivers and services
Fix issue with checking end tags. Earlier some boolean variables were being set once a new
tag is detected at the same level which causes some incorrect values to be overwritten.
we should be doing this when we detect the end tag.
|
|\
| |
| |
| |
| |
| |
| | |
Merge commit '75c498426a17b47d445711bb9e36794b05876a56' into eclair
* commit '75c498426a17b47d445711bb9e36794b05876a56':
Add maxSdkVersion information in dump badging option
|
| | |
|
| |
| |
| |
| |
| |
| | |
Previously aapt would bail out on the first broken image, making it difficult to compile a comprehensive list of broken images. Now it will pre- and post-process all of them and report any and all errors (before exiting with an error code if any errors were encountered).
Bug: 2055485
|
| |
| |
| |
| |
| | |
Fixes a bug where any new configurations introduced in an overlay
would be half-way ignored (enough to result in a broken .apk).
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'
* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
First pass at reworking screen density/size APIs.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54'
* commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54':
Add "nodpi" density, and expose a bunch of density-related APIs.
|
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
('warning: ' instead of 'WARNING: ' or 'WARNING ')
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e'
* commit '72eb0acad5cffc57ce5006f6deab29ee259e461e':
Expand support for different screen sizes.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd'
* commit '1585bd24c10d16351f89e32dddbfa799f18db6bd':
Report densities in badging, debugging for nine patch bug.
|
| |
| |
| |
| |
| |
| |
| | |
The aapt tool now reports all available densities like it already did
for locales. Also this includes more resource data output, which I
was using to examine bug #1867049 (which at this point I am unable to
reproduce).
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'
* commit '684a2edbe192a2a76684c5d6855773196d2e1a2e':
Make aapt Error out when an overlay adds a string.
|
| |\
| | |
| | |
| | |
| | | |
* changes:
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
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b'
* commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b':
Catch when a file resource (non values) added in an overlay.
|
| |/
| |
| |
| |
| |
| |
| | |
File resources are assigned resource id's and if an overlay adds one
it renumbers things and breaks compatability. Used to segfault
if you tried before, but now catches it and lets you know what file
caused the problem.
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707'
* commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707':
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
|
| |
| |
| |
| | |
inet_address.h and Socket.h which were not used
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
api/current.xml
core/res/res/values/public.xml
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'
* commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
Update aapt badging for native code, configs, density, etc.
|
| | |
|
|\ \
| |/
| |
| | |
ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| |
| |
| |
| | |
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005'
* commit '6ee44d1ff30627388bf3afa5fa542780af8f4005':
Fix 1840639 to support overlays with zz_ZZ.
|
| |
| |
| |
| | |
Everything but strings worked fine before but a new default string would generate a build error.
|
| |
| |
| |
| |
| |
| | |
BUG=1754390
Automated import of CL 144547
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
BUG = 1730924
Original author: asuchitra
Merged from: //branches/cupcake/...
Automated import of CL 144309
|
| |
| |
| |
| | |
Automated import of CL 147028
|
| |
| |
| |
| |
| |
| |
| |
| | |
overlay processing.
Original author: rgreenwalt
Automated import of CL 144548
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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].
Original author: rgreenwalt
Automated import of CL 144413
|
|/
|
|
|
|
|
|
|
|
|
|
| |
version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
BUG = 1730924
Original author: asuchitra
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 144406
|
| |
|