OSDN Git Service
David Turner [Thu, 11 Feb 2010 19:02:09 +0000 (11:02 -0800)]
am
e6aa4229: Merge "Add NEON support to the NDK build system + docs" into eclair
Merge commit '
e6aa4229876baadfc16fedca1e4b2ec068508974' into eclair-plus-aosp
* commit '
e6aa4229876baadfc16fedca1e4b2ec068508974':
Add NEON support to the NDK build system + docs
David Turner [Thu, 11 Feb 2010 18:56:24 +0000 (10:56 -0800)]
Merge "Add NEON support to the NDK build system + docs" into eclair
James Yum [Wed, 10 Feb 2010 21:01:55 +0000 (13:01 -0800)]
James Yum [Wed, 10 Feb 2010 19:18:23 +0000 (11:18 -0800)]
cleanup
deleted: licensing/ILicenseResultListener.aidl
deleted: licensing/ILicensingService.aidl
deleted: licensing/LicenseChecker.java
deleted: licensing/LicenseCheckerCallback.java
deleted: licensing/LicenseValidator.java
deleted: licensing/Policy.java
deleted: licensing/ResponseData.java
deleted: licensing/StrictPolicy.java
Dirk Dougherty [Wed, 10 Feb 2010 02:42:38 +0000 (18:42 -0800)]
am
4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
Merge commit '
4389d65caea762b276b1b7d6fd560f4b2c4370b3' into eclair-plus-aosp
* commit '
4389d65caea762b276b1b7d6fd560f4b2c4370b3':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
Dirk Dougherty [Wed, 10 Feb 2010 02:36:48 +0000 (18:36 -0800)]
Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
Dirk Dougherty [Mon, 8 Feb 2010 18:22:43 +0000 (10:22 -0800)]
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
Change-Id: I149fb2aab91d0a2dfc4242a85118bf20dea97e42
David 'Digit' Turner [Tue, 9 Feb 2010 20:25:56 +0000 (12:25 -0800)]
Add NEON support to the NDK build system + docs
You can now define LOCAL_ARM_NEON to 'true' in your Android.mk
to indicate that a whole module must be compiled with NEON support.
Alternatively, use the .neon suffix when listing source files in
LOCAL_SRC_FILES to indicate that they should be built with NEON
support. E.g.:
LOCAL_SRC_FILES := foo.c.neon bar.c zoo.c.arm.neon
Note that .arm.neon is supported, but .neon.arm is NOT.
Also added documentation in docs/CPU-ARM-NEON.TXT
Another patch will provide one or more sample applications
to demonstrate all of this.
David Turner [Mon, 8 Feb 2010 20:52:35 +0000 (12:52 -0800)]
am
3b712fda: Merge "Add \'cpufeatures\' library to perform runtime CPU family/features detection." into eclair
Merge commit '
3b712fda34a3d7a71e6a4ba6ee495b178b2c1830' into eclair-plus-aosp
* commit '
3b712fda34a3d7a71e6a4ba6ee495b178b2c1830':
Add 'cpufeatures' library to perform runtime CPU family/features detection.
David Turner [Mon, 8 Feb 2010 20:35:21 +0000 (12:35 -0800)]
Merge "Add 'cpufeatures' library to perform runtime CPU family/features detection." into eclair
David 'Digit' Turner [Fri, 5 Feb 2010 22:29:11 +0000 (14:29 -0800)]
Add 'cpufeatures' library to perform runtime CPU family/features detection.
It is provided as a static library that NDK developers can link against.
The code is designed to run on all official Android platforms, starting
from Android 1.5.
The Android Open Source Project [Fri, 5 Feb 2010 21:51:37 +0000 (13:51 -0800)]
merge from open-source master
The Android Open Source Project [Fri, 5 Feb 2010 16:23:01 +0000 (08:23 -0800)]
am
c13fbca9: reconcile main tree with open-source eclair
Merge commit '
c13fbca985b333cfb09d2b29875b36594dd44d64' into eclair-plus-aosp
* commit '
c13fbca985b333cfb09d2b29875b36594dd44d64':
Add uses-feature for live wallpaper sample.
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:32 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Megha Joshi [Wed, 3 Feb 2010 20:29:01 +0000 (12:29 -0800)]
am
ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
Merge commit '
ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1' into eclair-plus-aosp
* commit '
ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1':
SampleSyncAdapter sample code.
Megha Joshi [Wed, 3 Feb 2010 20:24:47 +0000 (12:24 -0800)]
Merge "SampleSyncAdapter sample code." into eclair
Megha Joshi [Wed, 18 Nov 2009 22:54:03 +0000 (14:54 -0800)]
SampleSyncAdapter sample code.
Raphael Moll [Sat, 30 Jan 2010 01:22:29 +0000 (17:22 -0800)]
am
098a5264: Merge "SDK Manager: post install script to update SDK Setup.exe" into eclair
Merge commit '
098a5264920e089ec6958f8c74dd0983eda5bc0f' into eclair-plus-aosp
* commit '
098a5264920e089ec6958f8c74dd0983eda5bc0f':
SDK Manager: post install script to update SDK Setup.exe
Raphael Moll [Sat, 30 Jan 2010 01:17:26 +0000 (17:17 -0800)]
Merge "SDK Manager: post install script to update SDK Setup.exe" into eclair
David Turner [Fri, 29 Jan 2010 22:52:17 +0000 (14:52 -0800)]
am
50c5ce01: Merge "Force ARMv7 builds to use only 16 FP registers." into eclair
Merge commit '
50c5ce01ca7985b6a76ef67cf171a6eb29c69b80' into eclair-plus-aosp
* commit '
50c5ce01ca7985b6a76ef67cf171a6eb29c69b80':
Force ARMv7 builds to use only 16 FP registers.
David Turner [Fri, 29 Jan 2010 22:44:39 +0000 (14:44 -0800)]
Merge "Force ARMv7 builds to use only 16 FP registers." into eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:07:44 +0000 (14:07 -0800)]
reconcile android-2.1_r1 snapshot
Raphael [Thu, 28 Jan 2010 23:58:20 +0000 (15:58 -0800)]
SDK Manager: post install script to update SDK Setup.exe
SDK Bug:
2404830
Change-Id: I7e2346c95132ff6d26468d589212bf83e15ce407
David 'Digit' Turner [Fri, 29 Jan 2010 01:58:56 +0000 (17:58 -0800)]
Force ARMv7 builds to use only 16 FP registers.
This is needed because upcoming Cortex-A9 devices implement
VFPv3-D16 instead of the assumed VFPv3-D32 and have thus half
the floating-point registers.
James Yum [Thu, 28 Jan 2010 18:51:19 +0000 (10:51 -0800)]
am
b8168f27: Merge "Market licensing server library core." into eclair
Merge commit '
b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2' into eclair-plus-aosp
* commit '
b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2':
Market licensing server library core.
Brett Chabot [Thu, 28 Jan 2010 18:51:15 +0000 (10:51 -0800)]
am
e848f6b2: Merge "Fix cts-content testdef." into eclair
Merge commit '
e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9' into eclair-plus-aosp
* commit '
e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9':
Fix cts-content testdef.
James Yum [Thu, 28 Jan 2010 18:36:53 +0000 (10:36 -0800)]
Merge "Market licensing server library core." into eclair
Romain Guy [Thu, 28 Jan 2010 00:49:32 +0000 (16:49 -0800)]
Add uses-feature for live wallpaper sample.
Romain Guy [Thu, 28 Jan 2010 00:49:32 +0000 (16:49 -0800)]
Add uses-feature for live wallpaper sample.
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
James Yum [Tue, 26 Jan 2010 04:17:53 +0000 (20:17 -0800)]
Market licensing server library core.
new file: ILicenseResultListener.aidl
new file: ILicensingService.aidl
new file: LicenseChecker.java
new file: LicenseCheckerCallback.java
new file: Policy.java
new file: ResponseData.java
new file: StrictPolicy.java
new file: LicenseValidator.java
Brett Chabot [Thu, 28 Jan 2010 01:54:29 +0000 (17:54 -0800)]
Merge "Fix cts-content testdef." into eclair
Brett Chabot [Thu, 28 Jan 2010 01:17:16 +0000 (17:17 -0800)]
Fix cts-content testdef.
Change-Id: I02c98f57c0fbf7cd7fbcdf3e7ba642e0d66acf93
Romain Guy [Thu, 28 Jan 2010 01:04:23 +0000 (17:04 -0800)]
am
897af093: Add uses-feature for live wallpaper sample.
Merge commit '
897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp
* commit '
897af09372ca7c95db6c12554d9ff6fcec81ad58':
Add uses-feature for live wallpaper sample.
Romain Guy [Thu, 28 Jan 2010 00:49:32 +0000 (16:49 -0800)]
Add uses-feature for live wallpaper sample.
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
Raphael [Wed, 27 Jan 2010 00:28:13 +0000 (16:28 -0800)]
am
d51d36fa: Windows SDK: package new tools/find_java.bat
Merge commit '
d51d36fa5444ef5f28dbbe5903949e1a75bb2510' into eclair-plus-aosp
* commit '
d51d36fa5444ef5f28dbbe5903949e1a75bb2510':
Windows SDK: package new tools/find_java.bat
Raphael [Wed, 27 Jan 2010 00:14:55 +0000 (16:14 -0800)]
Windows SDK: package new tools/find_java.bat
SDK Bug:
2315813
Change-Id: Ice0eb6327b153fcaab42477cd4d3aa8ee12e0063
Dirk Dougherty [Sat, 23 Jan 2010 00:49:51 +0000 (16:49 -0800)]
am
c220077d: Merge "SDK doc change: Misc fixes." into eclair
Merge commit '
c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp
* commit '
c220077d52972356ff30d46d47def7669731f0d7':
SDK doc change: Misc fixes.
Dirk Dougherty [Sat, 23 Jan 2010 00:45:03 +0000 (16:45 -0800)]
Merge "SDK doc change: Misc fixes." into eclair
Dirk Dougherty [Tue, 12 Jan 2010 00:33:57 +0000 (16:33 -0800)]
SDK doc change: Misc fixes.
Bug:
2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
Xavier Ducrohet [Fri, 22 Jan 2010 18:52:03 +0000 (10:52 -0800)]
am
a6181df4: Add Dell Mini5 to the USB driver.
Merge commit '
a6181df43110ce1bea8a856295ce372ab06a7873' into eclair-plus-aosp
* commit '
a6181df43110ce1bea8a856295ce372ab06a7873':
Add Dell Mini5 to the USB driver.
Xavier Ducrohet [Fri, 22 Jan 2010 01:36:19 +0000 (17:36 -0800)]
Add Dell Mini5 to the USB driver.
Change-Id: If0758e6dc43541fd2877e7d00ff3abf9d354a299
Karl Ostmo [Thu, 10 Dec 2009 22:38:50 +0000 (16:38 -0600)]
resolves Issue #5280: Go to problem in source from LogCat
Eric Rowe [Fri, 15 Jan 2010 01:12:33 +0000 (17:12 -0800)]
am
d98ba32e: DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Merge commit '
d98ba32eeff587a30396fa24728a1150de9dc305' into eclair-plus-aosp
* commit '
d98ba32eeff587a30396fa24728a1150de9dc305':
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Eric Rowe [Fri, 15 Jan 2010 01:12:28 +0000 (17:12 -0800)]
am
7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
Merge commit '
7d961f86208b35c12867a049d4bb815da72167d3' into eclair-plus-aosp
* commit '
7d961f86208b35c12867a049d4bb815da72167d3':
DO NOT MERGE Create way to run monkey with multiple scripts.
Eric Rowe [Wed, 4 Nov 2009 02:24:47 +0000 (18:24 -0800)]
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
Eric Rowe [Wed, 28 Oct 2009 22:25:45 +0000 (15:25 -0700)]
DO NOT MERGE Create way to run monkey with multiple scripts.
By giving multiple -f arguments, the monkey will randomly choose between the
scripts. Also, add the --setup argument which will run a setup script before
starting to play the other scripts in random order.
Eric Rowe [Thu, 14 Jan 2010 03:29:32 +0000 (19:29 -0800)]
am
c1d00a99: Merge "Fix how the monkey counts events for scripts." into eclair
Merge commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e' into eclair-plus-aosp
* commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e':
Fix how the monkey counts events for scripts.
Eric Rowe [Thu, 14 Jan 2010 03:25:21 +0000 (19:25 -0800)]
Merge "Fix how the monkey counts events for scripts." into eclair
Eric Rowe [Wed, 13 Jan 2010 23:55:53 +0000 (15:55 -0800)]
Fix how the monkey counts events for scripts.
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file. This allows us to have multiple script files with differing
event counts in each.
Conflicts:
cmds/monkey/src/com/android/commands/monkey/Monkey.java
David Turner [Thu, 14 Jan 2010 01:25:42 +0000 (17:25 -0800)]
am
23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
Merge commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c' into eclair-plus-aosp
* commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c':
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
David Turner [Thu, 14 Jan 2010 01:21:11 +0000 (17:21 -0800)]
Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
David 'Digit' Turner [Thu, 14 Jan 2010 00:50:57 +0000 (16:50 -0800)]
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
Eric Rowe [Wed, 13 Jan 2010 23:41:28 +0000 (15:41 -0800)]
am
b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Merge commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197' into eclair-plus-aosp
* commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Tue, 20 Oct 2009 01:06:38 +0000 (18:06 -0700)]
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java. Also, fix bug where too few arguments in
the script causes a RuntimeException.
Raphael Moll [Tue, 12 Jan 2010 23:38:37 +0000 (15:38 -0800)]
am
2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739' into eclair-plus-aosp
* commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:32:03 +0000 (15:32 -0800)]
Merge "Add etc1tool to Windows SDK." into eclair
The Android Open Source Project [Tue, 12 Jan 2010 23:18:14 +0000 (15:18 -0800)]
android-2.1_r1 snapshot
Xavier Ducrohet [Tue, 12 Jan 2010 20:46:21 +0000 (12:46 -0800)]
am
2f2fb96b: Make the SDK packaging put the samples in the root folder.
Merge commit '
2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp
* commit '
2f2fb96b4b037a016336a98e3b637f4394e1f323':
Make the SDK packaging put the samples in the root folder.
Xavier Ducrohet [Tue, 12 Jan 2010 20:32:12 +0000 (12:32 -0800)]
Make the SDK packaging put the samples in the root folder.
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
Raphael [Tue, 12 Jan 2010 19:11:07 +0000 (11:11 -0800)]
Add etc1tool to Windows SDK.
SDK BUG
2368918
This depends on Change I1b4f5e39 from build/core.
Change-Id: I8348514506742aa70cdee057e94069a67357a689
Trevor Johns [Mon, 11 Jan 2010 22:05:34 +0000 (14:05 -0800)]
am
c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
Merge commit '
c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp
* commit '
c7d2c4580552a4921ed1f1fa78b0a180eb995193':
Adding index file for BusinessCard sample. This will be displayed in the HTML
Trevor Johns [Mon, 11 Jan 2010 22:00:50 +0000 (14:00 -0800)]
Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
Xavier Ducrohet [Mon, 11 Jan 2010 20:07:57 +0000 (12:07 -0800)]
am
ef54fe9a: Fix compilation error by declaring stride before the first goto
Merge commit '
ef54fe9aaab4124e61850062d2212b20c20c8ea5' into eclair-plus-aosp
* commit '
ef54fe9aaab4124e61850062d2212b20c20c8ea5':
Fix compilation error by declaring stride before the first goto
Xavier Ducrohet [Mon, 11 Jan 2010 20:00:41 +0000 (12:00 -0800)]
Fix compilation error by declaring stride before the first goto
Change-Id: I242601038dc7290eac0e4745abaa1ec35d859c09
Trevor Johns [Fri, 8 Jan 2010 00:44:43 +0000 (16:44 -0800)]
Adding index file for BusinessCard sample. This will be displayed in the HTML
documentation when this sample is selected via the Resource tab.
Jack Palevich [Sun, 10 Jan 2010 05:54:20 +0000 (21:54 -0800)]
am
a8ba4a0e: Merge "Add the tool etc1tool to the sdk." into eclair
Merge commit '
a8ba4a0e361b44dd5edf954a8b088b310023eb3b' into eclair-plus-aosp
* commit '
a8ba4a0e361b44dd5edf954a8b088b310023eb3b':
Add the tool etc1tool to the sdk.
Jack Palevich [Sun, 10 Jan 2010 05:54:17 +0000 (21:54 -0800)]
am
84d83ba8: Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair
Merge commit '
84d83ba81b076cc6234e3fc92b8367b89fab5561' into eclair-plus-aosp
* commit '
84d83ba81b076cc6234e3fc92b8367b89fab5561':
DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
Jack Palevich [Sun, 10 Jan 2010 05:51:27 +0000 (21:51 -0800)]
Merge "Add the tool etc1tool to the sdk." into eclair
Jack Palevich [Sun, 10 Jan 2010 05:51:15 +0000 (21:51 -0800)]
Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair
Ying Wang [Sat, 9 Jan 2010 02:42:58 +0000 (18:42 -0800)]
am
7e3d6785: Fixes bug of the number of injected monkey events.
Merge commit '
7e3d678570d9e9849a249476275fec0a4bb1be1e' into eclair-plus-aosp
* commit '
7e3d678570d9e9849a249476275fec0a4bb1be1e':
Fixes bug of the number of injected monkey events.
Ying Wang [Tue, 29 Dec 2009 23:41:09 +0000 (15:41 -0800)]
Fixes bug of the number of injected monkey events.
Returns the actual events number that has been injected,
if any system error has occurred.
Jack Palevich [Fri, 8 Jan 2010 07:56:34 +0000 (15:56 +0800)]
Add the tool etc1tool to the sdk.
etc1tool is a command line tool for compressing and decompressing
ETC1 textures. This texture format is commonly supported by OpenGL
ES 2.0 GPUs.
Jack Palevich [Fri, 8 Jan 2010 06:52:08 +0000 (14:52 +0800)]
DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
The ETC1 texture format is commonly supported by
OpenGL ES 2.0-capable GPUs.
For historical reasons ETC1 texture files have the
default extension .PKM
This tool relies on the libETC1 library to
compress and decompress the image data.
Ying Wang [Wed, 6 Jan 2010 21:44:28 +0000 (13:44 -0800)]
am
9c7692aa: Set ro.monkey if it\'s not set yet.
Merge commit '
9c7692aabbf28554810f440fc7ff60fc9c335dc9' into eclair-plus-aosp
* commit '
9c7692aabbf28554810f440fc7ff60fc9c335dc9':
Set ro.monkey if it's not set yet.
Ying Wang [Wed, 6 Jan 2010 18:16:55 +0000 (10:16 -0800)]
Set ro.monkey if it's not set yet.
http://b/issue?id=
1681101
Ying Wang [Mon, 4 Jan 2010 20:58:44 +0000 (12:58 -0800)]
am
48f0d899: Annouce that Monkey is running.
Merge commit '
48f0d8993b5e871dd2695e983266aa655801769e' into eclair-plus-aosp
* commit '
48f0d8993b5e871dd2695e983266aa655801769e':
Annouce that Monkey is running.
Ying Wang [Wed, 30 Dec 2009 22:37:04 +0000 (14:37 -0800)]
Annouce that Monkey is running.
http://b/issue?id=
1681101
Dirk Dougherty [Wed, 16 Dec 2009 03:26:25 +0000 (19:26 -0800)]
am
1d151678: Merge change Ie8650e4b into eclair
Merge commit '
1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp
* commit '
1d15167865b22730cf6ba314a057e62f960aa1db':
sdk doc change for esr: fix some broken links to resources files.
Android (Google) Code Review [Wed, 16 Dec 2009 03:23:33 +0000 (19:23 -0800)]
Merge change Ie8650e4b into eclair
* changes:
sdk doc change for esr: fix some broken links to resources files.
Dirk Dougherty [Wed, 16 Dec 2009 02:47:00 +0000 (18:47 -0800)]
sdk doc change for esr: fix some broken links to resources files.
Bug:
2160782
Change-Id: Ie8650e4b642a96e67a2e7e62669282bc58d414ba
Trevor Johns [Tue, 15 Dec 2009 20:17:03 +0000 (12:17 -0800)]
am
5dba584a: Merge change Ic3464854 into eclair
Merge commit '
5dba584a08e6d2d5c84ca971b796e053995e4214' into eclair-plus-aosp
* commit '
5dba584a08e6d2d5c84ca971b796e053995e4214':
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
Android (Google) Code Review [Tue, 15 Dec 2009 20:13:54 +0000 (12:13 -0800)]
Merge change Ic3464854 into eclair
* changes:
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
Xavier Ducrohet [Tue, 15 Dec 2009 18:33:08 +0000 (10:33 -0800)]
am
b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image.
Merge commit '
b84cf9e1e378f6cc6642b4ac3f391a85b208a23b' into eclair-plus-aosp
* commit '
b84cf9e1e378f6cc6642b4ac3f391a85b208a23b':
Clean up the SDK and make it compiled and installed in the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 15:42:50 +0000 (07:42 -0800)]
am
1162372c: Use the feature list for the SDK.
Merge commit '
1162372c9e7ff4b6e60d247fb057b47f571af86f' into eclair-plus-aosp
* commit '
1162372c9e7ff4b6e60d247fb057b47f571af86f':
Use the feature list for the SDK.
Trevor Johns [Tue, 15 Dec 2009 07:25:00 +0000 (23:25 -0800)]
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
Xavier Ducrohet [Tue, 15 Dec 2009 06:34:06 +0000 (22:34 -0800)]
Clean up the SDK and make it compiled and installed in the SDK system image.
Change-Id: I6e5f01a1cc45beada70608307f4ac38a4dcdd0b9
Xavier Ducrohet [Tue, 15 Dec 2009 02:01:14 +0000 (18:01 -0800)]
Use the feature list for the SDK.
Change-Id: I926a682ac23a373276d10223af9f1e47ebc617d0
vchtchetkine [Fri, 11 Dec 2009 21:34:42 +0000 (13:34 -0800)]
am
2276398d: Merge change I0d9344aa into eclair
Merge commit '
2276398db0b0208b7627dc436ecc9e6c09e68107' into eclair-plus-aosp
* commit '
2276398db0b0208b7627dc436ecc9e6c09e68107':
Fixed
Android (Google) Code Review [Fri, 11 Dec 2009 21:29:37 +0000 (13:29 -0800)]
Merge change I0d9344aa into eclair
* changes:
Fixed
vchtchetkine [Fri, 11 Dec 2009 15:14:38 +0000 (07:14 -0800)]
Fixed
Xavier Ducrohet [Fri, 11 Dec 2009 01:16:53 +0000 (17:16 -0800)]
am
7579e4af: Merge change I9fb303e6 into eclair
Merge commit '
7579e4afcff771ed7e137b46bd019acd581c9568' into eclair-plus-aosp
* commit '
7579e4afcff771ed7e137b46bd019acd581c9568':
Add new samples to the SDK.
Android (Google) Code Review [Fri, 11 Dec 2009 01:12:47 +0000 (17:12 -0800)]
Merge change I9fb303e6 into eclair
* changes:
Add new samples to the SDK.
Roman Nurik [Fri, 11 Dec 2009 01:06:41 +0000 (17:06 -0800)]
am
e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit '
e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9' into eclair-plus-aosp
* commit '
e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Xavier Ducrohet [Fri, 11 Dec 2009 00:54:52 +0000 (16:54 -0800)]
Add new samples to the SDK.
Change-Id: I9fb303e6b6f6fb00172f4f5bf64a2c56649c2491
Roman Nurik [Thu, 10 Dec 2009 17:43:24 +0000 (09:43 -0800)]
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Trevor Johns [Thu, 10 Dec 2009 02:12:09 +0000 (18:12 -0800)]
am
0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '
0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-plus-aosp
* commit '
0359bdb72f3da3f319d0b3ef87a70c4f98d4154f':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
Android (Google) Code Review [Thu, 10 Dec 2009 02:07:31 +0000 (18:07 -0800)]
Merge change I2b0bb983 into eclair
* changes:
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
David 'Digit' Turner [Thu, 10 Dec 2009 00:07:36 +0000 (16:07 -0800)]
am
1fd97693: Merge change Ia13e890e into eclair
Merge commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-plus-aosp
* commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Android (Google) Code Review [Thu, 10 Dec 2009 00:02:14 +0000 (16:02 -0800)]
Merge change Ia13e890e into eclair
* changes:
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
David 'Digit' Turner [Wed, 9 Dec 2009 23:46:07 +0000 (15:46 -0800)]
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.