OSDN Git Service
Jack Palevich [Thu, 31 Dec 2009 06:29:37 +0000 (14:29 +0800)]
Fix compiler error by ensuring a variable is always initialized.
Jack Palevich [Thu, 24 Dec 2009 08:18:25 +0000 (16:18 +0800)]
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.
Android (Google) Code Review [Tue, 22 Dec 2009 10:33:40 +0000 (02:33 -0800)]
Merge change I8e509908
* changes:
Remove unnecessary matrix stack manipulations.
Jack Palevich [Tue, 22 Dec 2009 10:32:05 +0000 (18:32 +0800)]
Remove unnecessary matrix stack manipulations.
glDrawTexiOES does not use the matix stack, so no need to modify it.
Dan Egnor [Thu, 17 Dec 2009 01:10:26 +0000 (17:10 -0800)]
Add some more buttons to Bad Behavior:
- crash system server
- report a Log.wtf()
Update Monkey for changes to IActivityController interface.
Dan Morrill [Sun, 15 Nov 2009 23:46:36 +0000 (15:46 -0800)]
Additional content massaging based on feedback received.
Grace Kloba [Wed, 16 Dec 2009 22:24:17 +0000 (14:24 -0800)]
am
6be651ee: am
3bc69e62: Merge change Ib59457e0 into eclair-mr2
Merge commit '
6be651ee000270b56b285f60a6bda9c090cfbb9f'
* commit '
6be651ee000270b56b285f60a6bda9c090cfbb9f':
Change full screen surface to Opaque as it is required
Grace Kloba [Wed, 16 Dec 2009 22:21:19 +0000 (14:21 -0800)]
am
3bc69e62: Merge change Ib59457e0 into eclair-mr2
Merge commit '
3bc69e6256b616514871276e24bf98f37b3f89ad' into eclair-mr2-plus-aosp
* commit '
3bc69e6256b616514871276e24bf98f37b3f89ad':
Change full screen surface to Opaque as it is required
Android (Google) Code Review [Wed, 16 Dec 2009 22:16:45 +0000 (14:16 -0800)]
Merge change Ib59457e0 into eclair-mr2
* changes:
Change full screen surface to Opaque as it is required by the new plugin model.
Grace Kloba [Wed, 16 Dec 2009 19:38:53 +0000 (11:38 -0800)]
Change full screen surface to Opaque as it is required
by the new plugin model.
Comment out the video as it is not working and causes
crash when touch.
Android (Google) Code Review [Wed, 16 Dec 2009 19:29:36 +0000 (11:29 -0800)]
Merge change Ie8b10efd
* changes:
Finish adding Makefiles for the Notepad tutorial.
Ying Wang [Wed, 16 Dec 2009 19:12:46 +0000 (11:12 -0800)]
am
564c9930: am
53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2
Merge commit '
564c993069fe049a755be7ecffa510fe64a1917e'
* commit '
564c993069fe049a755be7ecffa510fe64a1917e':
Package blacklist/whitelist file support for Monkey.
Ying Wang [Wed, 16 Dec 2009 18:47:41 +0000 (10:47 -0800)]
am
53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2
Merge commit '
53a8ae6060ad02b9e2747455d3b5e4229a82e051' into eclair-mr2-plus-aosp
* commit '
53a8ae6060ad02b9e2747455d3b5e4229a82e051':
Package blacklist/whitelist file support for Monkey.
Android (Google) Code Review [Wed, 16 Dec 2009 18:43:43 +0000 (10:43 -0800)]
Merge changes I84cafc84,Idc388c56 into eclair-mr2
* changes:
Merge commit 'goog/eclair-mr2' into play-with-monkey
Package blacklist/whitelist file support for Monkey.
Tom O'Neill [Tue, 15 Dec 2009 19:27:15 +0000 (11:27 -0800)]
Finish adding Makefiles for the Notepad tutorial.
Add the missing makefiles for the non-solution versions of the tutorial
code. Required providing missing imports in Notepadv2. Also standardized
white spaces using Source > Correct Indentation in Eclipse and a few
manual changes. This was done to minimize differences such as:
diff -r Notepadv1 Notepadv1Solution
diff -r Notepadv1Solution/src/com/android/demo/notepad1/ Notepadv2/src/com/android/demo/notepad2/
Change-Id: Ie8b10efd61f2200b3c741ea500a6924710ab54ed
Dirk Dougherty [Wed, 16 Dec 2009 07:27:22 +0000 (23:27 -0800)]
Merge commit '
e897c1b4' into manualmerge
Conflicts:
samples/ApiDemos/src/com/example/android/apis/app/_index.html
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 23:06:19 +0000 (15:06 -0800)]
am
55d80586: am
5dba584a: Merge change Ic3464854 into eclair
Merge commit '
55d80586c76580bf6cbc00e9bd89658a72aa985b'
* commit '
55d80586c76580bf6cbc00e9bd89658a72aa985b':
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
Xavier Ducrohet [Tue, 15 Dec 2009 23:05:51 +0000 (15:05 -0800)]
am
cf4e98b2: am
b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image.
Merge commit '
cf4e98b260230ea5d9290d2e18f37b2f3c585970'
* commit '
cf4e98b260230ea5d9290d2e18f37b2f3c585970':
Clean up the SDK and make it compiled and installed in the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 23:04:36 +0000 (15:04 -0800)]
am
436be3f8: am
1162372c: Use the feature list for the SDK.
Merge commit '
436be3f862065e67087fbc95fd75b03e0496cea3'
* commit '
436be3f862065e67087fbc95fd75b03e0496cea3':
Use the feature list for the SDK.
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.
Android Git Automerger [Tue, 15 Dec 2009 08:45:10 +0000 (00:45 -0800)]
Merge commit 'goog/eclair-plus-aosp'
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
Fred Quintana [Tue, 15 Dec 2009 02:18:24 +0000 (18:18 -0800)]
am
f5fc8b06: am
7dbb3c29: moved the hidden sync helpers out of the framework
Merge commit '
f5fc8b06014bc763d26cc0cfcf0073a1edccfc4a'
* commit '
f5fc8b06014bc763d26cc0cfcf0073a1edccfc4a':
moved the hidden sync helpers out of the framework
Xavier Ducrohet [Tue, 15 Dec 2009 02:01:14 +0000 (18:01 -0800)]
Use the feature list for the SDK.
Change-Id: I926a682ac23a373276d10223af9f1e47ebc617d0
Fred Quintana [Tue, 15 Dec 2009 00:37:58 +0000 (16:37 -0800)]
am
7dbb3c29: moved the hidden sync helpers out of the framework
Merge commit '
7dbb3c2900e206c1468868e195fc37bf2d4932b1' into eclair-mr2-plus-aosp
* commit '
7dbb3c2900e206c1468868e195fc37bf2d4932b1':
moved the hidden sync helpers out of the framework
Ying Wang [Tue, 15 Dec 2009 00:23:32 +0000 (16:23 -0800)]
Merge commit 'goog/eclair-mr2' into play-with-monkey
Conflicts:
cmds/monkey/src/com/android/commands/monkey/Monkey.java
Tom O'Neill [Mon, 14 Dec 2009 23:33:01 +0000 (15:33 -0800)]
am
ba192890: am
5595acbe: Merge change Ice325f3b into eclair-mr2
Merge commit '
ba192890472dbb92c01d596633571fe2f074d759'
* commit '
ba192890472dbb92c01d596633571fe2f074d759':
Fix Notepadv3Solution orientation changes during NoteEdit
Tom O'Neill [Mon, 14 Dec 2009 23:24:09 +0000 (15:24 -0800)]
am
5595acbe: Merge change Ice325f3b into eclair-mr2
Merge commit '
5595acbed8ca1778a61881a00d7baaffecb2a64c' into eclair-mr2-plus-aosp
* commit '
5595acbed8ca1778a61881a00d7baaffecb2a64c':
Fix Notepadv3Solution orientation changes during NoteEdit
Fred Quintana [Fri, 11 Dec 2009 21:18:02 +0000 (13:18 -0800)]
moved the hidden sync helpers out of the framework
Android (Google) Code Review [Mon, 14 Dec 2009 19:50:14 +0000 (11:50 -0800)]
Merge change Ice325f3b into eclair-mr2
* changes:
Fix Notepadv3Solution orientation changes during NoteEdit
vchtchetkine [Sun, 13 Dec 2009 20:38:47 +0000 (12:38 -0800)]
vchtchetkine [Sun, 13 Dec 2009 20:32:03 +0000 (12:32 -0800)]
am
ec30731d: am
2276398d: Merge change I0d9344aa into eclair
Merge commit '
ec30731d8f415a427f15280bdc14ea6c54f5904d' into eclair-mr2-plus-aosp
* commit '
ec30731d8f415a427f15280bdc14ea6c54f5904d':
Fixed
vchtchetkine [Sun, 13 Dec 2009 20:23:31 +0000 (12:23 -0800)]
am
2276398d: Merge change I0d9344aa into eclair
Merge commit '
2276398db0b0208b7627dc436ecc9e6c09e68107' into eclair-mr2
* commit '
2276398db0b0208b7627dc436ecc9e6c09e68107':
Fixed
Tom O'Neill [Sat, 12 Dec 2009 00:01:04 +0000 (16:01 -0800)]
Fix Notepadv3Solution orientation changes during NoteEdit
The current NoteEdit.java in Notepadv3Solution crashes on NPE when the
screen orientation changes. This happens because a null Long is
auto-unboxed to a long when used as an input to
Bundle.putLong(String, long). The easiest solution is to use
Bundle.putSerializable() instead.
In addition duplicate notepad entries could result because mRowId was not
necessarily defined when onSaveInstanceState(Bundle) was called. The
solution to that is to call saveState() in that method.
Fixes these buganizer bugs:
Change-Id: Ice325f3b089867e4716deb48aefe8ec03f30ad55
http://b/issue?id=
2266994
http://b/issue?id=
2266962
Dan Egnor [Fri, 11 Dec 2009 22:28:02 +0000 (14:28 -0800)]
am
6c9e7af4: am
d0225ee6: Remove the old Dev Tools exception browser (since it relies on now eliminated checkin database crash storage functionality).
Merge commit '
6c9e7af472f2e11d16146f1d9af15c47b90e3a0b'
* commit '
6c9e7af472f2e11d16146f1d9af15c47b90e3a0b':
Remove the old Dev Tools exception browser (since it relies on
Dan Egnor [Fri, 11 Dec 2009 22:22:33 +0000 (14:22 -0800)]
am
d0225ee6: Remove the old Dev Tools exception browser (since it relies on now eliminated checkin database crash storage functionality).
Merge commit '
d0225ee63f305ef59e17f8ad0dc16b2ef5e85af0' into eclair-mr2-plus-aosp
* commit '
d0225ee63f305ef59e17f8ad0dc16b2ef5e85af0':
Remove the old Dev Tools exception browser (since it relies on
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
Dan Egnor [Thu, 10 Dec 2009 00:30:23 +0000 (16:30 -0800)]
Remove the old Dev Tools exception browser (since it relies on
now eliminated checkin database crash storage functionality).
Add a new test app to Dev Tools, "Bad Behavior", which has
buttons to crash and generate an ANR on command.
Update the Monkey to follow changed APIs.
Tom O'Neill [Fri, 11 Dec 2009 20:35:54 +0000 (12:35 -0800)]
am
7f5c4a68: am
f2519b44: Add Android.mk files for the Notepad tutorial\'s solutions
Merge commit '
7f5c4a68ce8006386e747b755067171d84651e30'
* commit '
7f5c4a68ce8006386e747b755067171d84651e30':
Add Android.mk files for the Notepad tutorial's solutions
Tom O'Neill [Fri, 11 Dec 2009 20:31:25 +0000 (12:31 -0800)]
am
f2519b44: Add Android.mk files for the Notepad tutorial\'s solutions
Merge commit '
f2519b444f658d2d7af8f85b0b95d12f32cf8bd2' into eclair-mr2-plus-aosp
* commit '
f2519b444f658d2d7af8f85b0b95d12f32cf8bd2':
Add Android.mk files for the Notepad tutorial's solutions
vchtchetkine [Fri, 11 Dec 2009 15:14:38 +0000 (07:14 -0800)]
Fixed
Tom O'Neill [Fri, 11 Dec 2009 19:25:36 +0000 (11:25 -0800)]
Add Android.mk files for the Notepad tutorial's solutions
Now the tutorial is built as part of the standard build, but not installed
as part of the system image. Required localizing an android:text field
that was already localized in Notepadv1 but for some odd reason was no
longer localized in v2 and v3.
Change-Id: I0e1b41a4efa454a503b788b0698593136662a014
Xavier Ducrohet [Fri, 11 Dec 2009 09:38:55 +0000 (01:38 -0800)]
am
320411d5: am
79ace486: am
7579e4af: Merge change I9fb303e6 into eclair
Merge commit '
320411d59f78cb8f5b487614693aa260eaaa1653'
* commit '
320411d59f78cb8f5b487614693aa260eaaa1653':
Add new samples to the SDK.
Roman Nurik [Fri, 11 Dec 2009 09:38:51 +0000 (01:38 -0800)]
am
8b13cf63: am
70634b36: am
e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit '
8b13cf63d4d96e290c83a35725ff26cf2601b063'
* commit '
8b13cf63d4d96e290c83a35725ff26cf2601b063':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Trevor Johns [Fri, 11 Dec 2009 07:41:21 +0000 (23:41 -0800)]
am
ddedf966: am
5f6b6bfb: am
0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '
ddedf9666e90cfac79c1b31ff2beaef4ad60366c'
* commit '
ddedf9666e90cfac79c1b31ff2beaef4ad60366c':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
David 'Digit' Turner [Fri, 11 Dec 2009 07:41:16 +0000 (23:41 -0800)]
am
79c8d6bc: am
04df8565: am
1fd97693: Merge change Ia13e890e into eclair
Merge commit '
79c8d6bc0678b86b6dd41eb4d854bddc315fa244'
* commit '
79c8d6bc0678b86b6dd41eb4d854bddc315fa244':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Xavier Ducrohet [Fri, 11 Dec 2009 03:54:51 +0000 (19:54 -0800)]
am
79ace486: am
7579e4af: Merge change I9fb303e6 into eclair
Merge commit '
79ace48637207ba918a19d55acd9eeda700ff203' into eclair-mr2-plus-aosp
* commit '
79ace48637207ba918a19d55acd9eeda700ff203':
Add new samples to the SDK.
Roman Nurik [Fri, 11 Dec 2009 03:54:47 +0000 (19:54 -0800)]
am
70634b36: am
e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit '
70634b3633dc2847df14db67a4e22dce5a16e45f' into eclair-mr2-plus-aosp
* commit '
70634b3633dc2847df14db67a4e22dce5a16e45f':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Xavier Ducrohet [Fri, 11 Dec 2009 03:48:51 +0000 (19:48 -0800)]
am
7579e4af: Merge change I9fb303e6 into eclair
Merge commit '
7579e4afcff771ed7e137b46bd019acd581c9568' into eclair-mr2
* commit '
7579e4afcff771ed7e137b46bd019acd581c9568':
Add new samples to the SDK.
Roman Nurik [Fri, 11 Dec 2009 03:48:38 +0000 (19:48 -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-mr2
* commit '
e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Trevor Johns [Fri, 11 Dec 2009 01:51:34 +0000 (17:51 -0800)]
am
5f6b6bfb: am
0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '
5f6b6bfb881601bdcb65c274449ffad08df5b29b' into eclair-mr2-plus-aosp
* commit '
5f6b6bfb881601bdcb65c274449ffad08df5b29b':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
David 'Digit' Turner [Fri, 11 Dec 2009 01:51:30 +0000 (17:51 -0800)]
am
04df8565: am
1fd97693: Merge change Ia13e890e into eclair
Merge commit '
04df8565bf8f2b81a632fcd736cb96c8da478b9e' into eclair-mr2-plus-aosp
* commit '
04df8565bf8f2b81a632fcd736cb96c8da478b9e':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Trevor Johns [Fri, 11 Dec 2009 01:44:35 +0000 (17:44 -0800)]
am
0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '
0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-mr2
* commit '
0359bdb72f3da3f319d0b3ef87a70c4f98d4154f':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
David 'Digit' Turner [Fri, 11 Dec 2009 01:40:07 +0000 (17:40 -0800)]
am
1fd97693: Merge change Ia13e890e into eclair
Merge commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-mr2
* commit '
1fd97693dc03fac4e189e5361a7ac7ee033caff2':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Tom O'Neill [Fri, 11 Dec 2009 01:25:48 +0000 (17:25 -0800)]
am
44e994e1: am
036832ad: Merge change Ic944ab1e into eclair-mr2
Merge commit '
44e994e1d47deab75c19d8684e4da8398b448044'
* commit '
44e994e1d47deab75c19d8684e4da8398b448044':
Extract and check in NotepadCodeLab.zip for change tracking
Tom O'Neill [Fri, 11 Dec 2009 01:21:48 +0000 (17:21 -0800)]
am
036832ad: Merge change Ic944ab1e into eclair-mr2
Merge commit '
036832adba9d953f8d34ece1bd5b049f02437928' into eclair-mr2-plus-aosp
* commit '
036832adba9d953f8d34ece1bd5b049f02437928':
Extract and check in NotepadCodeLab.zip for change tracking
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:16:32 +0000 (17:16 -0800)]
Merge change Ic944ab1e into eclair-mr2
* changes:
Extract and check in NotepadCodeLab.zip for change tracking
Romain Guy [Fri, 11 Dec 2009 01:14:18 +0000 (17:14 -0800)]
am
764ff751: am
dcf99fbe: Merge change If4ff28ed into eclair-mr2
Merge commit '
764ff7513a47da76a59fee7c5f299afb7662aac6'
* commit '
764ff7513a47da76a59fee7c5f299afb7662aac6':
Cleanup one of the ListView sample demos.
Trevor Johns [Fri, 11 Dec 2009 01:14:13 +0000 (17:14 -0800)]
am
19d79f2f: am
4eb4ed2d: am
bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit '
19d79f2fb44ce0ce48bd95f972d929910afa951c'
* commit '
19d79f2fb44ce0ce48bd95f972d929910afa951c':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
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.
Romain Guy [Fri, 11 Dec 2009 00:58:46 +0000 (16:58 -0800)]
am
dcf99fbe: Merge change If4ff28ed into eclair-mr2
Merge commit '
dcf99fbe7ac981c4ef3c8def65213e148281547a' into eclair-mr2-plus-aosp
* commit '
dcf99fbe7ac981c4ef3c8def65213e148281547a':
Cleanup one of the ListView sample demos.
Trevor Johns [Fri, 11 Dec 2009 00:55:06 +0000 (16:55 -0800)]
am
4eb4ed2d: am
bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit '
4eb4ed2d19c498998bb9560c71873fa6657d0644' into eclair-mr2-plus-aosp
* commit '
4eb4ed2d19c498998bb9560c71873fa6657d0644':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Xavier Ducrohet [Fri, 11 Dec 2009 00:54:52 +0000 (16:54 -0800)]
Add new samples to the SDK.
Change-Id: I9fb303e6b6f6fb00172f4f5bf64a2c56649c2491
Android (Google) Code Review [Fri, 11 Dec 2009 00:51:41 +0000 (16:51 -0800)]
Merge change If4ff28ed into eclair-mr2
* changes:
Cleanup one of the ListView sample demos.
Trevor Johns [Fri, 11 Dec 2009 00:45:44 +0000 (16:45 -0800)]
am
bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit '
bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-mr2
* commit '
bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Romain Guy [Thu, 10 Dec 2009 23:19:03 +0000 (15:19 -0800)]
Cleanup one of the ListView sample demos.
Tom O'Neill [Wed, 9 Dec 2009 23:41:05 +0000 (15:41 -0800)]
Extract and check in NotepadCodeLab.zip for change tracking
The 3-part Notepad tutorial is currently only available in the zip archive
frameworks/base/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip.
This CL adds the uncompressed code to the repository so that there is a
paper trail of future changes to the code.
Ying Wang [Tue, 8 Dec 2009 22:59:43 +0000 (14:59 -0800)]
Package blacklist/whitelist file support for Monkey.
With this CL, you can specify a package whitelist file or a package blacklist file,
but not both. You can not specify both individual packages via -p and blacklist file,
either. But you can specify both whitelist file and individual packages via -p and they
will be summed up.
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.
Grace Kloba [Thu, 10 Dec 2009 02:37:51 +0000 (18:37 -0800)]
am
3744ddfa: am
2c0f89aa: Update SampleBrowserPlugin to show handling long press and double tap events.
Merge commit '
3744ddfa36deaed303401d5faec18a40daac8e28'
* commit '
3744ddfa36deaed303401d5faec18a40daac8e28':
Update SampleBrowserPlugin to show handling
Jack Palevich [Thu, 10 Dec 2009 02:37:45 +0000 (18:37 -0800)]
am
67250c0d: am
3c31d6cd: Simple Matrix Palette skinning sample.
Merge commit '
67250c0d1fcf08f8dc507c269ba3974344db5883'
* commit '
67250c0d1fcf08f8dc507c269ba3974344db5883':
Simple Matrix Palette skinning sample.
Jack Palevich [Thu, 10 Dec 2009 02:12:42 +0000 (10:12 +0800)]
resolved conflicts for merge of
59a3008a to master
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/.
Trevor Johns [Thu, 10 Dec 2009 00:26:31 +0000 (16:26 -0800)]
am
ed1bc094: am
37fbca22: am
5865825d: Merge change Iabe9529e into eclair
Merge commit '
ed1bc094cf0688a79ee9a9f030533986d2eff249'
* commit '
ed1bc094cf0688a79ee9a9f030533986d2eff249':
Adding ContactManager sample to SDK samples.
Scott Main [Thu, 10 Dec 2009 00:26:26 +0000 (16:26 -0800)]
am
8158980b: am
441b80ab: am
6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '
8158980be8336c37a30a35de4e1dbbc3b0bb02d3'
* commit '
8158980be8336c37a30a35de4e1dbbc3b0bb02d3':
change the way bytes are read from InputStream.
James Yum [Thu, 10 Dec 2009 00:26:21 +0000 (16:26 -0800)]
Nicolas Catania [Thu, 10 Dec 2009 00:26:15 +0000 (16:26 -0800)]
am
2bfd9db9: am
863270d1: Merge change I5ba25302 into eclair-mr2
Merge commit '
2bfd9db950534a45b718f8939120a05ced5346f4'
* commit '
2bfd9db950534a45b718f8939120a05ced5346f4':
Added the new phone app unittest to runtest.
Derek Sollenberger [Thu, 10 Dec 2009 00:26:09 +0000 (16:26 -0800)]
am
2823d675: am
e8454e79: updating sample plugin to use new full screen interfaces.
Merge commit '
2823d675626ead99e00dcf9958fda80c766b7f5b'
* commit '
2823d675626ead99e00dcf9958fda80c766b7f5b':
updating sample plugin to use new full screen interfaces.
Dianne Hackborn [Thu, 10 Dec 2009 00:26:02 +0000 (16:26 -0800)]
am
d564588d: am
579c7f19: Reorganize Service API demos.
Merge commit '
d564588d7dd6975e13037af5cec6c33f52c9e55d'
* commit '
d564588d7dd6975e13037af5cec6c33f52c9e55d':
Reorganize Service API demos.
Andrew Stadler [Thu, 10 Dec 2009 00:10:02 +0000 (16:10 -0800)]
resolved conflicts for merge of
e85c304f to master
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.
Grace Kloba [Thu, 10 Dec 2009 00:01:30 +0000 (16:01 -0800)]
am
2c0f89aa: Update SampleBrowserPlugin to show handling long press and double tap events.
Merge commit '
2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5' into eclair-mr2-plus-aosp
* commit '
2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5':
Update SampleBrowserPlugin to show handling
Jack Palevich [Wed, 9 Dec 2009 23:59:16 +0000 (15:59 -0800)]
am
3c31d6cd: Simple Matrix Palette skinning sample.
Merge commit '
3c31d6cded51b6e6719b0052ec9987ca7218c868' into eclair-mr2-plus-aosp
* commit '
3c31d6cded51b6e6719b0052ec9987ca7218c868':
Simple Matrix Palette skinning sample.
Jack Palevich [Wed, 9 Dec 2009 23:59:12 +0000 (15:59 -0800)]
am
5dc44989: Add OpenGL ES 2.0 sample.
Merge commit '
5dc449896cb596159652d15e7333d74e53601609' into eclair-mr2-plus-aosp
* commit '
5dc449896cb596159652d15e7333d74e53601609':
Add OpenGL ES 2.0 sample.
Trevor Johns [Wed, 9 Dec 2009 23:56:43 +0000 (15:56 -0800)]
am
37fbca22: am
5865825d: Merge change Iabe9529e into eclair
Merge commit '
37fbca223a683b1d914b7b26eaf79da6c29aa113' into eclair-mr2-plus-aosp
* commit '
37fbca223a683b1d914b7b26eaf79da6c29aa113':
Adding ContactManager sample to SDK samples.
Scott Main [Wed, 9 Dec 2009 23:55:47 +0000 (15:55 -0800)]
am
441b80ab: am
6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '
441b80ab3795cb9f02afa7a7397dccd7c17c0cdd' into eclair-mr2-plus-aosp
* commit '
441b80ab3795cb9f02afa7a7397dccd7c17c0cdd':
change the way bytes are read from InputStream.
James Yum [Wed, 9 Dec 2009 23:54:38 +0000 (15:54 -0800)]
am
1b5a89a2: am
d2962a33: TextToSpeech API demo.
Merge commit '
1b5a89a2041586eba7211e996d4de9a5300e8b2d' into eclair-mr2-plus-aosp
* commit '
1b5a89a2041586eba7211e996d4de9a5300e8b2d':
TextToSpeech API demo.
Nicolas Catania [Wed, 9 Dec 2009 23:47:48 +0000 (15:47 -0800)]
am
863270d1: Merge change I5ba25302 into eclair-mr2
Merge commit '
863270d143ab4d496029f8417094187061e74ef2' into eclair-mr2-plus-aosp
* commit '
863270d143ab4d496029f8417094187061e74ef2':
Added the new phone app unittest to runtest.
OSDN Git Service
