| 64ed105957098a900d58e7c2598e060cb37755ce |
|
25-Jul-2011 |
Kenny Root <kroot@android.com> |
am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit 'e612c881ecf74770098aa9c07d4f0611ac982038':
Continue idmap generation even if name lookup fails.
|
| f51ded0f8f593d17af82946eb65c05fc04f688b4 |
|
10-Jun-2011 |
Dianne Hackborn <hackbod@google.com> |
am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
Enforce public resource restriction on bag parents.
|
| 426431adcc220b6adfbe1d9530247f897e60fa36 |
|
09-Jun-2011 |
Dianne Hackborn <hackbod@google.com> |
Enforce public resource restriction on bag parents.
Need to put some more styles in the SDK to avoid breaking apps.
Also, welcome Android 3.2.
Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68 |
|
20-May-2011 |
Dianne Hackborn <hackbod@google.com> |
am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
Add new "-swNNNdp" resource qualifier.
|
| 69cb87576ba163b61bb0e6477a3b7c57a9b11d40 |
|
20-May-2011 |
Dianne Hackborn <hackbod@google.com> |
Add new "-swNNNdp" resource qualifier.
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| fcaba1464ef010ba0e3fdcbce2af74e45daec627 |
|
19-May-2011 |
Mårten Kongstad <marten.kongstad@sonyericsson.com> |
Continue idmap generation even if name lookup fails.
In resources.arsc files, a resource is represented by a specification
block and one or more value blocks. In rare cases, a resource name
is also given a new resource ID, a specification block and no values
blocks. This commit ensures idmap generation does not fail if such an
entry is encountered.
Change-Id: I32302a0b07a7a320b7eeb31886931be3bb7b7e9a
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 2e4a3236a7634d17f89288e9739a438ecbea0471 |
|
13-May-2011 |
Dianne Hackborn <hackbod@google.com> |
am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
|
| ebff8f92f13513ce37bd74759eb1db63f2220590 |
|
13-May-2011 |
Dianne Hackborn <hackbod@google.com> |
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
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
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 18490fb93e206fd899c3258096cc32f293373c92 |
|
12-Apr-2011 |
Kenny Root <kroot@google.com> |
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
|
| 57f4b77c89bafedf9468f9a636561c0c193405c9 |
|
17-Mar-2011 |
Mårten Kongstad <marten.kongstad@sonyericsson.com> |
Runtime resource overlay, iteration 1.
Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.
This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.
This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.
Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 371de9695508073fbbde8181eb230e99cb045206 |
|
30-Jan-2011 |
Dianne Hackborn <hackbod@android.com> |
am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"
* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234':
Normalize output from aapt d
|
| e75d87266b59fc76cfb1b9bbc9a4734b8fd1664f |
|
28-Jan-2011 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #3392073: At times soft keyboard comes up in...
...gallery while attaching picture to gmail message
In various places we could block switching the IME target incorrectly.
Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 9872bf4a2d4ae1e7ded170c8e74d400fe6be9bfb |
|
20-Dec-2010 |
Shachar Shemesh <lingnu@gmail.com> |
Normalize output from aapt d
Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed
regardless of the content of the strings.
Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 300ba6846949f5b21c6d93d7698dbc39716cf832 |
|
09-Nov-2010 |
Kenny Root <kroot@google.com> |
Split UTF functions from String8/16
Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.
Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 5c4cf8cd7ccd76f25a8433096774b44a6dd8ead8 |
|
02-Nov-2010 |
Kenny Root <kroot@google.com> |
Fix default return code for getResource
Reorganization of getResource to allow for other densities accidentally
overrode the default return code for getResource from BAD_VALUE to
BAD_INDEX. This corrects the default return to BAD_VALUE which restores
other things to working.
Bug: 3155824
Change-Id: I13dafff85bc6978c5f5435fc09ab0474c7885c4d
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 55fc850cf992cdcb0993cb109d2f716613c0dbdd |
|
28-Oct-2010 |
Kenny Root <kroot@google.com> |
Add path to get different DPI drawables
Allow a caller to request a different density than their current display
allows. This can mean a device displaying mdpi can get a resource that's
in hdpi and have it pretend to be in mdpi resolution. If a drawable
that's returned is not in the requested density, it will set it at the
appropriate density to be scaled up later on.
The API for this is hidden currently.
Bug: 3134688
Change-Id: I6c3908cbdef4907b8d3f1576df9e3b0e7af1755a
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 871603074739320b8e7a82772da12c48587f3a40 |
|
03-Sep-2010 |
Kenny Root <kroot@google.com> |
am 8d5250c6: am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread
Merge commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf'
* commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf':
Add better debug output for ResourceType errors
|
| 68c2e915fdf4ac4c9f48c0b182e9190620014bc6 |
|
02-Sep-2010 |
Kenny Root <kroot@google.com> |
Add better debug output for ResourceType errors
An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.
Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 5e4d9a04fdf9bf28650853cb19a1b06b0d543c51 |
|
08-Jun-2010 |
Kenny Root <kroot@google.com> |
Add invariant check for stylesString size
It was possible for stylesStrings to claim to start past the end of the
data area thereby making mStringPoolSize larger than the data area.
Change-Id: Ibc4d5b429e3a388516135801c8abc3681daae291
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 06983bc566eca6dc3ef477baaa1520bfa95cee52 |
|
08-Jun-2010 |
Kenny Root <kroot@google.com> |
Range checking for ResTable_map
Correct previous offset change and get ready for safe-iop.
Change-Id: Ib276c726f32b0711a72f47d3263eb21640e5a800
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 3379195a76fff85a13ffd3c443edeb8fde48b085 |
|
08-Jun-2010 |
Kenny Root <kroot@google.com> |
Improve checking in aapt dump
The aapt dump reading had less error checking than the actual parsing,
so this change brings it more into parity so that bad APKs don't crash
"aapt dump"
Change-Id: Ib30e63e41be5c652645c4aa0de580a87b184529d
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| ddcafcbd62c4efdc70bc626ab210a3c41dd1333c |
|
04-Jun-2010 |
Konstantin Lopyrev <klopyrev@google.com> |
Fix 1684100: Making sure that empty package, type and resource ids are not accepted.
Change-Id: I4c94877e4312e9a5b4d22c8625069ca056c62e40
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 14cee9f688c32d63d8521188e7422811629bb7c2 |
|
24-Apr-2010 |
Dianne Hackborn <hackbod@google.com> |
New xlarge screen size.
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
/frameworks/base/libs/utils/ResourceTypes.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/libs/utils/ResourceTypes.cpp
|
| 20cb56e26e91df91bd64d4251222e0d421cdbe47 |
|
04-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Fix some bugs.
Bug #2376231: Apps lose window focus (and back key causes ANR) if the
lock screen is dismissed while the phone is in landscape mode
This is another case where we weren't recomputing the focused window
after changing the visibility policy.
bug #2479958: Investigate source of "Resources don't contain package
for resource number 0x7f0a0000"
Um, okay, so it turns out there were bugs all over the place where
we would load an XML resource from a another application, but not
use the Resources for that application to retrieve its resources...!
I think the only reason any of this stuff was working at all was
because it typically only cared about retrieving the resource
identifiers of the items (it would look up the values later).
Bug #2401082: Passion ERE26 monkey crash - InputMethodManagerService
Add some null checks.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| ef05e076ced1a32c5c0aaee28403779834adb2ba |
|
02-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #2448075: aapt doesn't fix up activity-alias 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.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 56c0952a1f200665934a4d11975d0feb832f9908 |
|
02-Mar-2010 |
Ficus Kirkpatrick <ficus@android.com> |
Demote the famous ResourceTypes warning to LOGV.
It is spamming the log bigtime and can be promoted back to LOGW
or worse by whoever decides to actually investigate the bug.
Change-Id: I72d950155378f641ebdfbacabae774f5736a52bc
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 780d2a1b714724d85227141c76b3c64f543f00b4 |
|
23-Feb-2010 |
Kenny Root <kroot@google.com> |
Use UTF-8 strings to avoid duplicate caching, part 1
StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.
This is part 1. Part 2 will include ResXMLParser optimizations.
Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| bb79f64b89bd7be7019035a0347c681e6f39fe6b |
|
10-Dec-2009 |
Kenny Root <kroot@google.com> |
Add string resource type inspection
Allows "aapt dump --values resource" to print out whether a string in a
ResStringPool is in UTF-8 or UTF-16 encoding.
Change-Id: I6478884a70a3b46fee862dece6cb33454fc34843
/frameworks/base/libs/utils/ResourceTypes.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/libs/utils/ResourceTypes.cpp
|
| b8d81679553ee33f6ae5281310abf2effca4ffcd |
|
20-Nov-2009 |
Dianne Hackborn <hackbod@google.com> |
Debugging for issue #2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)
Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 119376ed49ff118a59b955b66b09ad57ce54587d |
|
28-Sep-2009 |
Doug Zongker <dougz@android.com> |
fix "pacakge" typo in error log message
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 6cca1599f78549716ef120245e54fa1961976dda |
|
20-Sep-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Also a little improved debugging output of bad resource identifiers.
Change-Id: I054064ef22855608ffd722e4ccf12ce57d1992b2
/frameworks/base/libs/utils/ResourceTypes.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/libs/utils/ResourceTypes.cpp
|
| 0d221012ff5fd314711c00ed30e9b807b9c454c1 |
|
30-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
It turns out we were not returning the density for anything retrieved from a
TypedArray... which basically means any bitmap references from a layout or style...!!!
This is now fixed.
Also fiddle with the density compatibility mode to turn on smoothing in certain situations,
helping the look of things when they need to scale and we couldn't do the scaling at
load time.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| c4db95c077f826585d20be2f3db4043c53d30cf5 |
|
22-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
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.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| a53b828635fce8b6b2d3e3377d74d72070056623 |
|
17-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
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.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 6c11e73f678a46b0a74c6f1936eebd51dc60f0af |
|
09-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix resources not being set correctly.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 78c405178c57bb45e40f1e2839d6a18d91f7f02c |
|
06-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Don't re-parse the framework resources all the time.
A small optimization to the resource code, to not re-parse the framework
resources every time we build a new AssetManager. Instead, you can now
construct a ResTable from a previously created one... of course, like the
existing code for using the data in-place, you can't delete the original
ResTable until you have deleted the one that has been constructed from it.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| de7faf658cd40d34c08a98b39477055da8e19172 |
|
30-Jun-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #1673793: Theme styles don't apply.
It turns out this was not a problem in the resource code at all. Rather,
the system process has a cache of pre-loaded attributes it uses to avoid
continually reloading things as it needs them. Well it turns out this
cache wasn't flushed after a package was uninstalled or a configuration
changed, so you could re-install an app where you change its style resources
so its theme now points to one that is inconsistent in the cache.
This is mostly a problem for developers, where they continually install
new versions of an app where resources have changed. This could possibly
show up when updating an app on a normal phone, although the problem would
eventually correct itself since this cache uses weak references.
Anyway, the cache is now reworked to be flushed appropriately.
This change also includes an update to aapt to be able to dump the
contents of bags in resources.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 723738cfaec3dd7b0fe152c872c41bebf94074c4 |
|
26-Jun-2009 |
Dianne Hackborn <hackbod@google.com> |
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.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 5f91097b26f036a45e32f4e4cae3e9e135a6042d |
|
22-Jun-2009 |
Mathias Agopian <mathias@google.com> |
fix warnings that will show up with GCC 4.4 (in master)
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| e17086ba346009a26cc2299b133a0fe602acb6ec |
|
20-Jun-2009 |
Dianne Hackborn <hackbod@google.com> |
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).
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 96e20409afc720f61d0cd49bf1441f62069bd6bb |
|
22-Apr-2009 |
Robert Greenwalt <robdroid@android.com> |
Squashed commit of the following:
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date: Wed Apr 22 14:31:26 2009 -0700
Additional fixes and tests for density.
commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date: Tue Apr 14 14:39:00 2009 -0700
Fix runtime resource selection logic.
Fix isBetterThan so that o or this may be supperior at any stage.
Used to only handle this-better or tie at each stage, biasing against o.
Also allows reset of unit test to succeed. Fixes bug 1709202.
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 4df2423a947bcd3f024cc3d3a1a315a8dc428598 |
|
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/libs/utils/ResourceTypes.cpp
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/libs/utils/ResourceTypes.cpp
|