Scott Main
c2b5b036d4
am d90f315f
: am cca05d9e
: am a01ee1ea
: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
...
Merge commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac'
* commit 'd90f315fc0cba9c473e53c57a74a9071e10dedac':
docs only.
2009-09-01 12:15:33 -07:00
Jean-Baptiste Queru
4730a61599
am 37321fde
: merge from open-source master
...
Merge commit '37321fdeeffc707cb33bd433dca27f18c205d1fe'
* commit '37321fdeeffc707cb33bd433dca27f18c205d1fe':
kcm tool fix for the keyboard output permissions
2009-09-01 12:14:15 -07:00
The Android Open Source Project
9f6de0f7d2
DRC63
2009-09-01 11:30:04 -07:00
The Android Open Source Project
9c149a93de
Merge commit 'remotes/goog/donut' into donut-release
2009-09-01 11:29:55 -07:00
Scott Main
d90f315fc0
am cca05d9e
: am a01ee1ea
: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
...
Merge commit 'cca05d9e658b4357995a73ca72793d46100aae8e' into eclair-plus-aosp
* commit 'cca05d9e658b4357995a73ca72793d46100aae8e':
docs only.
2009-09-01 10:43:15 -07:00
Scott Main
cca05d9e65
am a01ee1ea
: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
...
Merge commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042' into eclair
* commit 'a01ee1ea93cd2a4d876fcb5678392bbd277b6042':
docs only.
2009-09-01 10:41:03 -07:00
Scott Main
a01ee1ea93
docs only.
...
my previous change to the list styles was the wrong solution.
this fixes all prior problems with nested lists in OLs, ULs, and DLs
2009-09-01 10:36:55 -07:00
The Android Open Source Project
454f2994e9
ERC63
2009-09-01 08:36:24 -07:00
The Android Open Source Project
65b6e964e0
Merge commit 'remotes/goog/eclair' into eclair-release
2009-09-01 08:36:13 -07:00
Jean-Baptiste Queru
37321fdeef
merge from open-source master
2009-09-01 08:27:43 -07:00
Xavier Ducrohet
9427e73b73
am 9396155d
: Add camera feature files to the SDK system image.
...
Merge commit '9396155dae1a23171a388fcd3c3c8d64a9439062'
* commit '9396155dae1a23171a388fcd3c3c8d64a9439062':
Add camera feature files to the SDK system image.
2009-08-31 18:04:56 -07:00
Xavier Ducrohet
9396155dae
Add camera feature files to the SDK system image.
...
Without this the system refuses to install applications that
requires the camera (like ApiDemos)
Change-Id: Ia13b6a10f4731bf23eea04e3210ad0b3ed557aa6
2009-08-31 16:46:51 -07:00
Anonymous Coward
a577600718
am 6fc63e1f
: am f9f9d4f3
: Remove WebSearchProvider from build specs.
...
Merge commit '6fc63e1f82f8a2110c109eda90c19898f2aef4ae'
* commit '6fc63e1f82f8a2110c109eda90c19898f2aef4ae':
Remove WebSearchProvider from build specs.
2009-08-31 16:44:18 -07:00
The Android Open Source Project
b6ca6975f1
DRC62
2009-08-31 16:42:21 -07:00
The Android Open Source Project
4beb2674ad
Merge commit 'remotes/goog/donut' into donut-release
2009-08-31 16:42:08 -07:00
Andy McFadden
9611ceb460
Flush every line of output.
...
Works better when the output is piped through "tee" to a file.
2009-08-31 13:38:35 -07:00
Anonymous Coward
6fc63e1f82
am f9f9d4f3
: Remove WebSearchProvider from build specs.
...
Merge commit 'f9f9d4f3c393537f9cab5e8cc59d241ad2279474' into eclair
* commit 'f9f9d4f3c393537f9cab5e8cc59d241ad2279474':
Remove WebSearchProvider from build specs.
2009-08-31 10:53:49 -07:00
Anonymous Coward
f9f9d4f3c3
Remove WebSearchProvider from build specs.
2009-08-31 10:47:18 -07:00
The Android Open Source Project
304d049c4f
ERC62
2009-08-31 08:36:13 -07:00
The Android Open Source Project
df709c6099
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-31 08:36:00 -07:00
Joe Onorato
88ad7c5d46
am db7ab295
: Merge change 23258 into eclair
...
Merge commit 'db7ab295c4d6e9b03ea3149ad015699f63221087'
* commit 'db7ab295c4d6e9b03ea3149ad015699f63221087':
Add the ability to turn on proguard for java targets, and to call aapt
2009-08-30 13:49:27 -07:00
Android (Google) Code Review
db7ab295c4
Merge change 23258 into eclair
...
* changes:
Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
2009-08-30 13:44:22 -07:00
Joe Onorato
2daa2b3b05
Add the ability to turn on proguard for java targets, and to call aapt
...
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
2009-08-30 13:43:00 -07:00
Brett Chabot
153b0d9a4f
am 04253940
: am 3c7c8a60
: Merge change 22522 into donut
...
Merge commit '0425394081908f9f7c357c927c9d446d778b79e3'
* commit '0425394081908f9f7c357c927c9d446d778b79e3':
Add Gesture tests to CTS.
2009-08-29 16:49:02 -07:00
Brett Chabot
0425394081
am 3c7c8a60
: Merge change 22522 into donut
...
Merge commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair
* commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da':
Add Gesture tests to CTS.
2009-08-29 16:44:39 -07:00
Android (Google) Code Review
3c7c8a6086
Merge change 22522 into donut
...
* changes:
Add Gesture tests to CTS.
2009-08-29 16:42:25 -07:00
The Android Open Source Project
e2989179ce
DRC59
2009-08-28 14:20:38 -07:00
The Android Open Source Project
1503b4257a
ERC59B
2009-08-28 14:05:01 -07:00
The Android Open Source Project
cf6d088196
ERC59
2009-08-28 08:35:51 -07:00
The Android Open Source Project
edd8c2052c
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-28 08:35:41 -07:00
Daniel Sandler
981362caa2
am c6646c9a
: Introduce a default density (\'mdpi\') for all device builds.
...
Merge commit 'c6646c9ac41122ecc022102efdcceb890a0ca529'
* commit 'c6646c9ac41122ecc022102efdcceb890a0ca529':
Introduce a default density ('mdpi') for all device builds.
2009-08-28 07:51:09 -07:00
Daniel Sandler
c6646c9ac4
Introduce a default density ('mdpi') for all device builds.
...
This is done by appending "mdpi" (medium density or 160 dpi, which is what
we've been using so far on dream etc.) to PRODUCT_LOCALES if no other dpi is
found there. (PRODUCT_LOCALES is then sent as a configuration parameter to
aapt to determine which resources should be included in the build.)
With this change, each build will now include only one density of any given
asset. For example, if there exists
drawable-hdpi/foo.png
drawable-mdpi/foo.png
...then the build will include *only* drawable-mdpi/foo.png, unless the
density is overridden in the build's own device spec:
PRODUCT_LOCALES += hdpi
...in which case the build will include only drawable-hdpi/foo.png.
2009-08-28 10:00:12 -04:00
The Android Open Source Project
412ed5eda3
DRC58C
2009-08-27 22:18:38 -07:00
The Android Open Source Project
33b86ad856
ERC58C
2009-08-27 18:10:27 -07:00
The Android Open Source Project
d59b24325c
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-27 18:10:14 -07:00
Dirk Dougherty
123bb1228b
Doc changes for SDK update.
...
Update SDK toc template.
2009-08-27 16:48:25 -07:00
Doug Zongker
75b4ba0e4d
am f76b9c87
: remove bootloader assertions
...
Merge commit 'f76b9c87b16956aebfe5af497913d698dd03cc01'
* commit 'f76b9c87b16956aebfe5af497913d698dd03cc01':
remove bootloader assertions
2009-08-27 16:25:24 -07:00
Jay Schroeder
b7e96e4498
kcm tool fix for the keyboard output permissions
...
This patch adds read permission for everyone to the output files of the
kcm tool. The compiled keycharmap files need to be able to be read by
everyone. This fixes a problem at startup being unable to read the
*.kcm.bin files located at <android-root>/system/usr/keychars.
2009-08-27 18:16:25 -05:00
Doug Zongker
f76b9c87b1
remove bootloader assertions
...
These should be done by the device-specific module where necessary;
they aren't appropriate for all devices.
2009-08-27 16:12:00 -07:00
The Android Open Source Project
0364be9fe2
DRC58B
2009-08-27 15:40:48 -07:00
The Android Open Source Project
d85e883a71
ERC58B
2009-08-27 15:08:33 -07:00
Joshua Bloch
855003deb7
Making Droiddoc not explode when inherited interfaces disappear.
2009-08-27 14:43:03 -07:00
The Android Open Source Project
b6179579f7
DRC58
2009-08-27 11:23:39 -07:00
The Android Open Source Project
aa53037ba5
Merge commit 'remotes/goog/donut' into donut-release
2009-08-27 11:23:27 -07:00
The Android Open Source Project
8b4c6e8fed
ERC58
2009-08-27 08:36:10 -07:00
The Android Open Source Project
e5860a383a
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-27 08:35:55 -07:00
Doug Zongker
ebb71b4ebb
am 3938ab25
: am 1b6d0a65
: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
...
Merge commit '3938ab2572e7c9d5894975c0076b271b2846faa9'
* commit '3938ab2572e7c9d5894975c0076b271b2846faa9':
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
2009-08-26 23:26:49 -07:00
Doug Zongker
3938ab2572
am 1b6d0a65
: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
...
Merge commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584' into eclair
* commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584':
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
2009-08-26 23:22:05 -07:00
Doug Zongker
1b6d0a65fc
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
...
If a prebuilt specifies a LOCAL_CERTIFICATE, stick it in the
PACKAGES.* collection so that the predexopt process can work on the
file (which only works if the new .apk can be signed).
2009-08-26 18:22:43 -07:00
Doug Zongker
cdd9af8110
am fbc039e9
: am 4ac1ba61
: fix typo in bash expression
...
Merge commit 'fbc039e9b9cda43fd4dc8bd63887dcb8feaa22b8'
* commit 'fbc039e9b9cda43fd4dc8bd63887dcb8feaa22b8':
fix typo in bash expression
2009-08-26 11:47:38 -07:00