Kenny Root [Fri, 4 Dec 2009 17:38:48 +0000 (09:38 -0800)]
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
Kenny Root [Fri, 21 Aug 2009 20:23:45 +0000 (15:23 -0500)]
Fix bitmask in aapt's StringPool length construction
The StringPool indicates the length of a string with a 16-bit
integer. If the length of the string is greater than 0x7FFF,
it splits it into two 16-bit integers with the first one
having the high bit set.
The length calculation has a small bug that masks off the
19 bits instead of the first 15 bits as intended.
Dirk Dougherty [Wed, 4 Nov 2009 22:21:20 +0000 (14:21 -0800)]
am
5fc71e67: am
00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '
5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-mr2
* commit '
5fc71e67498ed64ad2d41c23471b008f93cb580e':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Dirk Dougherty [Wed, 4 Nov 2009 22:12:29 +0000 (14:12 -0800)]
am
00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '
00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair
* commit '
00e44ef21777f32b67a8d51ee375cd290a3fb2d4':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Dirk Dougherty [Tue, 3 Nov 2009 23:33:37 +0000 (15:33 -0800)]
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Bug:
2230588
Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
Doug Zongker [Thu, 22 Oct 2009 05:22:27 +0000 (22:22 -0700)]
am
617262d8: (-s ours) Merge change I37c4157d into eclair
Merge commit '
617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2
* commit '
617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Doug Zongker [Tue, 20 Oct 2009 00:04:21 +0000 (17:04 -0700)]
add "junk path" -k option to aapt (DO NOT MERGE)
Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Doug Zongker [Fri, 9 Oct 2009 18:24:51 +0000 (11:24 -0700)]
add "junk path" -k option to aapt
Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
Raphael [Thu, 24 Sep 2009 22:30:53 +0000 (15:30 -0700)]
AAPT: Ignore visual source safe files in resources
BUG
1895888
Suchi Amalapurapu [Sun, 20 Sep 2009 20:39:37 +0000 (13:39 -0700)]
Fix issue with printing gles version in aapt dump badging option
If the name attribute for uses-feature or uses-permission is empty
the error value is still empty indicating error and preventing the
else part from being checked as it should be.
Dianne Hackborn [Wed, 16 Sep 2009 05:50:40 +0000 (22:50 -0700)]
Implement issue #
1780928: Need support hiding nav keys.
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
Robert Greenwalt [Thu, 3 Sep 2009 01:23:57 +0000 (18:23 -0700)]
Fix compilation of add-resource tag.
It used the wrong tag-type to find the end of itself.
Eric Fischer [Tue, 1 Sep 2009 22:20:30 +0000 (15:20 -0700)]
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.
Robert Greenwalt [Mon, 31 Aug 2009 21:48:20 +0000 (14:48 -0700)]
Fix replacement-after-add of resource files in overlay.
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
Jean-Baptiste Queru [Mon, 31 Aug 2009 16:37:32 +0000 (09:37 -0700)]
am
57f03f0b: Merge snapshot version of donut back into the main tree
Merge commit '
57f03f0b5d0228799111651aa6915f7d837d501e' into eclair
* commit '
57f03f0b5d0228799111651aa6915f7d837d501e':
donut snapshot
Jean-Baptiste Queru [Mon, 31 Aug 2009 16:32:01 +0000 (09:32 -0700)]
Merge snapshot version of donut back into the main tree
Jean-Baptiste Queru [Mon, 31 Aug 2009 16:17:57 +0000 (09:17 -0700)]
donut snapshot
Joe Onorato [Sun, 30 Aug 2009 23:54:12 +0000 (16:54 -0700)]
applications are at level 2
Joe Onorato [Sun, 30 Aug 2009 20:36:22 +0000 (13:36 -0700)]
Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.
Dianne Hackborn [Fri, 28 Aug 2009 03:08:01 +0000 (20:08 -0700)]
Add platform infrastructure for features.
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
Dianne Hackborn [Thu, 27 Aug 2009 23:28:44 +0000 (16:28 -0700)]
Fix issue #
2084148: Define the format for the auto focus preview for barcode 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
Dianne Hackborn [Fri, 21 Aug 2009 22:14:02 +0000 (15:14 -0700)]
I am getting tired of the java doc warnings, so fix them.
Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
Suchi Amalapurapu [Tue, 18 Aug 2009 08:42:27 +0000 (01:42 -0700)]
Add aapt extensions to dump badging to print more info about activities, 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.
Suchi Amalapurapu [Tue, 18 Aug 2009 17:59:08 +0000 (10:59 -0700)]
am
75c49842: Add maxSdkVersion information in dump badging option
Merge commit '
75c498426a17b47d445711bb9e36794b05876a56' into eclair
* commit '
75c498426a17b47d445711bb9e36794b05876a56':
Add maxSdkVersion information in dump badging option
Daniel Sandler [Fri, 14 Aug 2009 20:47:30 +0000 (13:47 -0700)]
aapt now attempts to process all assets even if some are malformed.
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
Dianne Hackborn [Sat, 15 Aug 2009 07:00:33 +0000 (00:00 -0700)]
Fix aapt to be able to add configs from overlays.
Fixes a bug where any new configurations introduced in an overlay
would be half-way ignored (enough to result in a broken .apk).
Suchi Amalapurapu [Fri, 14 Aug 2009 22:13:09 +0000 (15:13 -0700)]
Add maxSdkVersion information in dump badging option
Dianne Hackborn [Thu, 13 Aug 2009 20:36:00 +0000 (13:36 -0700)]
Allow overlays to add resources.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:05:18 +0000 (09:05 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 30 Jul 2009 13:57:04 +0000 (06:57 -0700)]
am
f4dc9da3: Merge snapshot variant of donut back into the main tree
Merge commit '
f4dc9da3724c20837e3a361060acd139775541ac'
* commit '
f4dc9da3724c20837e3a361060acd139775541ac':
donut snapshot
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:30:25 +0000 (14:30 -0700)]
Merge snapshot variant of donut back into the main tree
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:25:07 +0000 (14:25 -0700)]
donut snapshot
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 02:52:22 +0000 (19:52 -0700)]
Merge korg/donut into korg/master
Android (Google) Code Review [Wed, 22 Jul 2009 02:03:53 +0000 (19:03 -0700)]
am
9fc20b0e: Merge change 8126 into donut
Merge commit '
9fc20b0e381b5fe00b7049ef357c839cd05a33bf'
* commit '
9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
First pass at reworking screen density/size APIs.
Dianne Hackborn [Wed, 22 Jul 2009 00:46:02 +0000 (17:46 -0700)]
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.
Jean-Baptiste Queru [Tue, 21 Jul 2009 21:38:36 +0000 (14:38 -0700)]
am
db7db69a: Merge snapshot variant of donut back into main tree
Merge commit '
db7db69a2162439bf722d0f1f65429ca3ca19dcd'
* commit '
db7db69a2162439bf722d0f1f65429ca3ca19dcd':
donut snapshot
Jean-Baptiste Queru [Tue, 21 Jul 2009 18:55:14 +0000 (11:55 -0700)]
Merge snapshot variant of donut back into main tree
Jean-Baptiste Queru [Tue, 21 Jul 2009 18:16:54 +0000 (11:16 -0700)]
donut snapshot
Android (Google) Code Review [Mon, 20 Jul 2009 03:28:49 +0000 (20:28 -0700)]
am
aad0fcc9: Merge change 7783 into donut
Merge commit '
aad0fcc9619eb72c18a6afff48ebc9d4011f0f54'
* commit '
aad0fcc9619eb72c18a6afff48ebc9d4011f0f54':
Add "nodpi" density, and expose a bunch of density-related APIs.
Dianne Hackborn [Fri, 17 Jul 2009 18:13:48 +0000 (11:13 -0700)]
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.
Jean-Baptiste Queru [Thu, 16 Jul 2009 20:47:28 +0000 (13:47 -0700)]
merge-ignore changes that were already in or that are not relevant
Merge commit '
7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD
Marco Nelissen [Mon, 13 Jul 2009 20:02:33 +0000 (13:02 -0700)]
Format aapt warnings the same way as other compiler warnings
('warning: ' instead of 'WARNING: ' or 'WARNING ')
Android (Google) Code Review [Mon, 29 Jun 2009 23:37:17 +0000 (16:37 -0700)]
am
72eb0aca: Merge change 5483 into donut
Merge commit '
72eb0acad5cffc57ce5006f6deab29ee259e461e'
* commit '
72eb0acad5cffc57ce5006f6deab29ee259e461e':
Expand support for different screen sizes.
Dianne Hackborn [Fri, 26 Jun 2009 02:48:04 +0000 (19:48 -0700)]
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.
Android (Google) Code Review [Fri, 19 Jun 2009 23:44:07 +0000 (16:44 -0700)]
am
1585bd24: Merge change 4828 into donut
Merge commit '
1585bd24c10d16351f89e32dddbfa799f18db6bd'
* commit '
1585bd24c10d16351f89e32dddbfa799f18db6bd':
Report densities in badging, debugging for nine patch bug.
Dianne Hackborn [Fri, 19 Jun 2009 22:13:28 +0000 (15:13 -0700)]
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).
Android (Google) Code Review [Wed, 10 Jun 2009 22:32:56 +0000 (15:32 -0700)]
am
684a2edb: Merge change 3577 into donut
Merge commit '
684a2edbe192a2a76684c5d6855773196d2e1a2e'
* commit '
684a2edbe192a2a76684c5d6855773196d2e1a2e':
Make aapt Error out when an overlay adds a string.
Android (Google) Code Review [Wed, 10 Jun 2009 19:36:45 +0000 (12:36 -0700)]
Merge change 3577 into donut
* changes:
Make aapt Error out when an overlay adds a string.
Robert Greenwalt [Tue, 9 Jun 2009 16:14:20 +0000 (09:14 -0700)]
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
Robert Greenwalt [Mon, 8 Jun 2009 18:06:48 +0000 (11:06 -0700)]
am
fa5c7e1d: Catch when a file resource (non values) added in an overlay.
Merge commit '
fa5c7e1dfede7e26260789dd2de5175497e9659b'
* commit '
fa5c7e1dfede7e26260789dd2de5175497e9659b':
Catch when a file resource (non values) added in an overlay.
Robert Greenwalt [Sat, 6 Jun 2009 01:53:26 +0000 (18:53 -0700)]
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.
Robert Greenwalt [Sat, 6 Jun 2009 04:17:43 +0000 (21:17 -0700)]
am
1aa8170e: Add per-named-item overlay ability in res xml.
Merge commit '
1aa8170e6a448afad86e5d62927d3b8ca4cd9707'
* commit '
1aa8170e6a448afad86e5d62927d3b8ca4cd9707':
Add per-named-item overlay ability in res xml.
Robert Greenwalt [Fri, 5 Jun 2009 22:59:15 +0000 (15:59 -0700)]
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
Mathias Agopian [Fri, 5 Jun 2009 21:56:35 +0000 (14:56 -0700)]
break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used
Mathias Agopian [Mon, 1 Jun 2009 02:13:00 +0000 (19:13 -0700)]
get rid of utils.h
The Android Open Source Project [Thu, 21 May 2009 05:41:10 +0000 (22:41 -0700)]
Merge commit '
f479aa0900e9a85afdc78b1048684e37579ebf23'
Conflicts:
api/current.xml
core/res/res/values/public.xml
Dianne Hackborn [Wed, 20 May 2009 23:01:06 +0000 (16:01 -0700)]
Add padding to public.xml to avoid breaking from auto-merges.
Jean-Baptiste Queru [Wed, 20 May 2009 18:49:58 +0000 (11:49 -0700)]
Jean-Baptiste Queru [Wed, 20 May 2009 18:28:11 +0000 (11:28 -0700)]
reconcile donut snapshot
Merge branch 'donut-snapshot' into HEAD
Jean-Baptiste Queru [Wed, 20 May 2009 18:28:04 +0000 (11:28 -0700)]
donut snapshot
Android (Google) Code Review [Tue, 19 May 2009 06:56:07 +0000 (23:56 -0700)]
am
656a2726: Merge change 1910 into donut
Merge commit '
656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'
* commit '
656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
Update aapt badging for native code, configs, density, etc.
Dianne Hackborn [Mon, 18 May 2009 22:22:00 +0000 (15:22 -0700)]
Update aapt badging for native code, configs, density, etc.
Dianne Hackborn [Sat, 16 May 2009 04:15:37 +0000 (21:15 -0700)]
Merge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge
Dianne Hackborn [Sat, 16 May 2009 01:45:15 +0000 (18:45 -0700)]
Argh fix another build breakage!
Dianne Hackborn [Sat, 16 May 2009 01:36:13 +0000 (18:36 -0700)]
am
5b3189e0: Fix the build. :(
Merge commit '
5b3189e03c71bcd276e0b39d0ec5e2f699a1697f'
* commit '
5b3189e03c71bcd276e0b39d0ec5e2f699a1697f':
Fix the build. :(
Implement compatibility support for WRITE_SDCARD permission.
Dianne Hackborn [Wed, 13 May 2009 22:06:13 +0000 (15:06 -0700)]
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.
Dianne Hackborn [Wed, 13 May 2009 22:06:13 +0000 (15:06 -0700)]
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.
Android (Google) Code Review [Mon, 11 May 2009 18:22:25 +0000 (11:22 -0700)]
am
6ee44d1: Merge change 1258 into donut
Merge commit '
6ee44d1ff30627388bf3afa5fa542780af8f4005'
* commit '
6ee44d1ff30627388bf3afa5fa542780af8f4005':
Fix
1840639 to support overlays with zz_ZZ.
Robert Greenwalt [Fri, 8 May 2009 18:45:37 +0000 (11:45 -0700)]
Fix
1840639 to support overlays with zz_ZZ.
Everything but strings worked fine before but a new default string would generate a build error.
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:17 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:58 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:34 +0000 (17:12 -0700)]
Merge donut into master
Marco Nelissen [Mon, 20 Apr 2009 23:17:25 +0000 (16:17 -0700)]
Merge branch 'readonly-p4-master'
Marco Nelissen [Mon, 20 Apr 2009 23:16:01 +0000 (16:16 -0700)]
AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.
Automated import of CL 147028
The Android Open Source Project [Wed, 15 Apr 2009 01:18:03 +0000 (18:18 -0700)]
Merge commit 'korg/cupcake'
Robert Greenwalt [Wed, 8 Apr 2009 00:19:28 +0000 (17:19 -0700)]
AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.
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 final result.
Ex: [A,B,C] default with [D] overlay should give [D] but used to
give [D,B,C]
BUG=
1754390
Automated import of CL 144950
Robert Greenwalt [Fri, 3 Apr 2009 23:46:32 +0000 (16:46 -0700)]
Merge branch 'readonly-p4-master'
Robert Greenwalt [Fri, 3 Apr 2009 23:45:18 +0000 (16:45 -0700)]
AI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay processing.
Original author: rgreenwalt
Automated import of CL 144548
Robert Greenwalt [Fri, 3 Apr 2009 23:44:30 +0000 (16:44 -0700)]
AI 144547: Fix change 144342 by making it active only during overlay processing.
BUG=
1754390
Automated import of CL 144547
Robert Greenwalt [Fri, 3 Apr 2009 06:37:35 +0000 (23:37 -0700)]
Merge branch 'readonly-p4-master'
Robert Greenwalt [Fri, 3 Apr 2009 06:36:26 +0000 (23:36 -0700)]
AI 144413: am: CL 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].
Original author: rgreenwalt
Automated import of CL 144413
Suchi Amalapurapu [Fri, 3 Apr 2009 06:19:43 +0000 (23:19 -0700)]
Merge branch 'readonly-p4-master'
Suchi Amalapurapu [Fri, 3 Apr 2009 06:18:34 +0000 (23:18 -0700)]
AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk 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
Robert Greenwalt [Thu, 2 Apr 2009 23:55:50 +0000 (16:55 -0700)]
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
Suchi Amalapurapu [Thu, 2 Apr 2009 22:20:29 +0000 (15:20 -0700)]
AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent 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
Suchi Amalapurapu [Thu, 2 Apr 2009 22:19:31 +0000 (15:19 -0700)]
AI 144308: aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
BUG =
1730924
BUG=
1730924
Automated import of CL 144308
Jean-Baptiste Queru [Wed, 18 Mar 2009 18:33:14 +0000 (11:33 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
The Android Open Source Project [Thu, 5 Mar 2009 22:34:35 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:31:44 +0000 (19:31 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:45 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:24 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:33 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Fri, 20 Feb 2009 15:38:31 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Tue, 10 Feb 2009 23:44:00 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Tue, 20 Jan 2009 22:05:35 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:03:58 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:16:01 +0000 (16:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:10 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645