199 Commits

Author SHA1 Message Date
Doug Zongker
b80d1d0cc8 am afbf8afa: Merge change I564b5b00 into eclair-mr2
Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp

* commit 'afbf8afa858a78b66c19f11cfda030e913b34085':
  add "junk path" -k option to aapt
2009-10-13 13:47:54 -07:00
Doug Zongker
dbe7a68cc1 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.
2009-10-13 13:33:31 -07:00
Xavier Ducrohet
4ab1b3a292 am 88fb78d2: am 5f9d4bae: layout lib tests cleanup
Merge commit '88fb78d2091764e1265976bdb7027f7785f0b33b' into eclair-mr2-plus-aosp

* commit '88fb78d2091764e1265976bdb7027f7785f0b33b':
  layout lib tests cleanup
2009-10-06 15:53:05 -07:00
Xavier Ducrohet
66ce0f07fc am c7bade2a: am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a' into eclair-mr2-plus-aosp

* commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a':
  Add a test to make sure the replaced classes in layoutlib are correct.
2009-10-06 15:52:59 -07:00
Xavier Ducrohet
5f9d4bae03 layout lib tests cleanup
- Move test files to their own package for easy binary inclusion
  in adt-test
- fix some tests and remove obsolete ones.

Change-Id: I5b967f29074fdad74073f9b37d903eabe8dc29e6
2009-10-06 15:14:09 -07:00
Xavier Ducrohet
0a9d46b7e7 Add a test to make sure the replaced classes in layoutlib are correct.
Change-Id: I9641635153c12e2c0a23583f7d094767533fc683
2009-10-06 15:13:58 -07:00
Xavier Ducrohet
3557d5bc9e am 9cf2bbb0: am 841a8eea: Merge change I24895c35 into eclair
Merge commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99' into eclair-mr2-plus-aosp

* commit '9cf2bbb08c0eb66bcfa45a03d4b21cac78be8e99':
  Reimplement all the method of Paint for layoutlib
2009-10-06 10:03:17 -07:00
Xavier Ducrohet
9f751ab3fc Reimplement all the method of Paint for layoutlib
There were a few missing methods that should have been reimplmented
(because they were native).

Others have been added just to be sure so that we can test whether methods
are missing or not (test coming soon).

Change-Id: I24895c353e38545e9b1abe28d41224fdc78cadb1
2009-10-05 19:10:04 -07:00
Xavier Ducrohet
636d9cd63b am 5becdc32: am a970bf52: Merge change I34f51342 into eclair
Merge commit '5becdc32c899f1e8031f5a694c064cb559a8fc88' into eclair-mr2-plus-aosp

* commit '5becdc32c899f1e8031f5a694c064cb559a8fc88':
  Fix the layoutlib test to run from adt-tests.
2009-10-05 16:09:29 -07:00
Xavier Ducrohet
5903a83df1 am 864cbf5f: am 71060f29: Merge change I8874a405 into eclair
Merge commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8' into eclair-mr2-plus-aosp

* commit '864cbf5f9396f35eafd90ad58911b5d280d8eab8':
  Refactor class/method names used by layoutlib_create.
2009-10-05 16:04:45 -07:00
Xavier Ducrohet
8c739671d2 Fix the layoutlib test to run from adt-tests.
Change-Id: I34f513429593dce9f781ed8a08c4664a5d6f9aa8
2009-10-05 15:36:53 -07:00
Xavier Ducrohet
ac7391de5f Refactor class/method names used by layoutlib_create.
Information about classes and methods that are replaced, renamed, removed
into CreateInfo, so that it can be used by the tests.

Change-Id: I8874a40503249416621aa90b2ca02dcaf30ecd57
2009-10-05 14:16:09 -07:00
Xavier Ducrohet
25c70dd9a1 am 279ba943: Merge change I7c7b1596 into eclair
Merge commit '279ba943553ec2368d14e1b3c8a88c36bf17785d' into eclair-plus-aosp

* commit '279ba943553ec2368d14e1b3c8a88c36bf17785d':
  Fix a warning output.
2009-09-28 13:55:36 -07:00
Xavier Ducrohet
f18ccc13a6 Fix a warning output.
This was introduced by the dpi work.

Change-Id: I7c7b1596085f70532b8279139c287a2a58f57046
2009-09-28 12:59:33 -07:00
Raphael
0416537145 am 20b39471: Merge change 26933 into eclair
Merge commit '20b394719daa218be7ff767fad024504f12e937b' into eclair-plus-aosp

* commit '20b394719daa218be7ff767fad024504f12e937b':
  AAPT: Ignore visual source safe files in resources
2009-09-24 15:45:17 -07:00
Raphael
3cdfc042dc AAPT: Ignore visual source safe files in resources
BUG 1895888
2009-09-24 15:30:53 -07:00
Dianne Hackborn
ad8d9dfb24 am ffa42480: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp

* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
2009-09-23 23:28:06 -07:00
Dianne Hackborn
ffa424800d Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Lot of infrastructure for more things to go away when "clear system dialogs"
happens, and now do this when we turn on the lock screen.

Change-Id: I567130296fe47ce82df065ed58ef21b37416ceaf
2009-09-23 23:17:07 -07:00
Xavier Ducrohet
d6fdec7bd1 am 3b805d57: Merge change 26616 into eclair
Merge commit '3b805d570716749966b909be16513f882522c58e' into eclair-plus-aosp

* commit '3b805d570716749966b909be16513f882522c58e':
  Add density support to layoutlib so that bitmap are scaled if needed.
2009-09-23 19:24:00 -07:00
Xavier Ducrohet
56a92e3ba0 Add density support to layoutlib so that bitmap are scaled if needed.
Change-Id: I00204bb136ccaa44deeafbe0ea8746fea9903341
2009-09-23 16:38:57 -07:00
Dianne Hackborn
5ddbc0d59d am de0dfb7b: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
Merge commit 'de0dfb7b65a02d4dd74c271b558adee0973fc267' into eclair-plus-aosp

* commit 'de0dfb7b65a02d4dd74c271b558adee0973fc267':
  Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-09-23 14:36:42 -07:00
Dianne Hackborn
de0dfb7b65 Fix issue #2125720 Weather Forecast Widget - graphics do not scale
I forgot to add the new density field to the Bitmaps' parcelable data.

Change-Id: I77cf3e93e356297e0caed6fc71b62b5cd8f79124
2009-09-23 14:26:02 -07:00
Bob Lee
a37b361693 am 3136d4b0: Merge change 26635 into eclair
Merge commit '3136d4b0108deaca5ab525881de47d2979911131' into eclair-plus-aosp

* commit '3136d4b0108deaca5ab525881de47d2979911131':
  Added tool to generate application-specific reports from class load profiling data. Generated new profiling data. Deleted old data. Generated new preloaded-classes file.
2009-09-23 11:34:36 -07:00
Android (Google) Code Review
3136d4b010 Merge change 26635 into eclair
* changes:
  Added tool to generate application-specific reports from class load profiling data. Generated new profiling data. Deleted old data. Generated new preloaded-classes file.
2009-09-23 14:28:16 -04:00
Bob Lee
fcc3ccb976 Added tool to generate application-specific reports from class load profiling data. Generated new profiling data. Deleted old data. Generated new preloaded-classes file. 2009-09-23 11:21:22 -07:00
Xavier Ducrohet
b47d07c29d am 0acf9a5b: Merge change 26539 into eclair
Merge commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f' into eclair-plus-aosp

* commit '0acf9a5b2f81413641d3d139ae6fd5f9df621e5f':
  Add density value to density enum.
2009-09-23 10:40:15 -07:00
Xavier Ducrohet
39cd36ec1f Add density value to density enum.
This is going to be used as constant to both ADT classes and the
layoutlib.

Change-Id: Id9befe83c5c2be3fbc5f045c7ed21aa8ee0108cc
2009-09-22 21:00:12 -07:00
Xavier Ducrohet
296e7b9519 am 32f76f34: Merge change 26517 into eclair
Merge commit '32f76f34075450c03c68fc1f65e395d5eddd6d51' into eclair-plus-aosp

* commit '32f76f34075450c03c68fc1f65e395d5eddd6d51':
  Add a new IResourceValue that knows about the density.
2009-09-22 19:56:31 -07:00
Xavier Ducrohet
ccb630df4b Add a new IResourceValue that knows about the density.
This will allow the layoutlib to resize bitmaps that are
not in the native density of the rendering.

Change-Id: If9dca6d51cd93a2083c96fce3ac64335ec6ad801
2009-09-22 18:30:22 -07:00
Suchi Amalapurapu
e8e977bc4a am f1871e27: Merge change 26009 into eclair
Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp

* commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112':
  Fix issue with printing gles version in aapt dump badging option
2009-09-20 14:35:24 -07:00
Suchi Amalapurapu
40b94725dc 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.
2009-09-20 13:40:02 -07:00
Dianne Hackborn
b7b083090f am a382cb81: Merge change 25929 into eclair
Merge commit 'a382cb81187437aa389dc131687e181ceaefa8ba' into eclair-plus-aosp

* commit 'a382cb81187437aa389dc131687e181ceaefa8ba':
  Add API to send an ordered sticky broadcast.
2009-09-19 12:29:56 -07:00
Dianne Hackborn
efa199f016 Add API to send an ordered sticky broadcast.
Change-Id: Ida7081204e226db0cd07ff618c08e308a909ec0c
2009-09-19 12:05:25 -07:00
Dianne Hackborn
1f3914b7f2 am fa82f22f: Fix issue #2093608: Calendar widget takes a few seconds to launch
Merge commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e' into eclair-plus-aosp

* commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e':
  Fix issue #2093608: Calendar widget takes a few seconds to launch
2009-09-17 18:13:26 -07:00
Dianne Hackborn
fa82f22f1d Fix issue #2093608: Calendar widget takes a few seconds to launch
Avert your eyes!

The key change here is that RemoteViews can now call a Context API to
start its pending intent, which inside of the activity manager we can
use to determine to cancel the timeout delay for external entities
to disrupt the home screen.

Change-Id: If097cf7478cbed7a3c04a304050bd7fd5703d197
2009-09-17 18:01:35 -07:00
Dianne Hackborn
10bedaaf3e am 7fc39b26: Merge change 25238 into eclair
Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp

* commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da':
  Implement issue #1780928: Need support hiding nav keys.
2009-09-15 23:11:35 -07:00
Dianne Hackborn
93e462b79d 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
2009-09-15 22:50:40 -07:00
Dianne Hackborn
7c32e4bc30 am d023f9a9: Merge change 24829 into eclair
Merge commit 'd023f9a9a90705410250cd86bc6446c738423a99' into eclair-plus-aosp

* commit 'd023f9a9a90705410250cd86bc6446c738423a99':
  Some optizations to wallpaper drawing/scrolling.
2009-09-14 15:54:08 -07:00
Android (Google) Code Review
d023f9a9a9 Merge change 24829 into eclair
* changes:
  Some optizations to wallpaper drawing/scrolling.
2009-09-14 18:45:42 -04:00
Dianne Hackborn
19382ac1a4 Some optizations to wallpaper drawing/scrolling.
First, fix some issues with the final wallpaper bitmap
we use: ensure it is always 16bpp, and make sure dithering
of its bitmap is turned off.   We take of dithering
when loading, to make sure we don't use it when drawing.

Also add new APIs to return the wallpaper with the equivalent
of Launcher's old FastBitmapDrawable.  As doing this, also load
the default wallpaper the same way as custom ones, taking care to
resize it as needed at load time.

Finally implement a mechanism for the window manager to wait
for the wallpaper to redraw at its new position before returning
from the application's call to change the offset.  This ensures
that the wallpaper better tracks the application.  Note that there
is a timeout in this wait that is relatively short, and if it
expires we will run for a while without waiting.

Change-Id: Ife449437746da85958bd447e0a6cf3d2223b398c
2009-09-14 15:29:44 -07:00
Raphael
d2bb9eae17 am 7cec5430: Merge change 24903 into eclair
Merge commit '7cec54302d421dd8c45ea25456b9677a7aa3d8d3' into eclair-plus-aosp

* commit '7cec54302d421dd8c45ea25456b9677a7aa3d8d3':
  Fix some LayoutBridge javadoc.
2009-09-14 12:12:51 -07:00
Raphael
7a79628cd9 Fix some LayoutBridge javadoc.
Change-Id: I255d1d58d3537403ac9a8a5c7adece30ae989ce0
2009-09-14 11:17:49 -07:00
Jean-Baptiste Queru
3c193a4a8d merge from open-source master 2009-09-04 07:54:30 -07:00
Jean-Baptiste Queru
be8e36e32b merge from donut 2009-09-03 15:19:21 -07:00
Robert Greenwalt
1cfe4b2a75 am e8f605ff: Merge change 23761 into eclair
Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp

* commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9':
  Fix compilation of add-resource tag.
2009-09-03 09:11:10 -07:00
Robert Greenwalt
93d7251699 Fix compilation of add-resource tag.
It used the wrong tag-type to find the end of itself.
2009-09-02 18:23:57 -07:00
Eric Fischer
7a797a02af am 66c70e13: Merge change 23529 into eclair
Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp

* commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e':
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
2009-09-02 11:19:19 -07:00
Kenny Root
44b283dc27 Fix %p vs %s typo in aapt message
When trying to print an xmltree or xmlstrings from aapt, the error
message if the resource didn't exist erroneously printed a pointer
instead of a string.

Change-Id: I317bbbdc1200e0f10922e80a36e41a22b2d50d0d
2009-09-01 19:07:48 -05:00
Eric Fischer
c87d25215c 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.
2009-09-01 15:20:30 -07:00
Jean-Baptiste Queru
85a2c7f1ca merge from open-source master 2009-09-01 11:46:14 -07:00