Commit Graph

5283 Commits

Author SHA1 Message Date
vchtchetkine
97ec041363 am 2276398d: Merge change I0d9344aa into eclair
Merge commit '2276398db0b0208b7627dc436ecc9e6c09e68107' into eclair-plus-aosp

* commit '2276398db0b0208b7627dc436ecc9e6c09e68107':
  Fixed
2009-12-11 13:34:42 -08:00
Android (Google) Code Review
2276398db0 Merge change I0d9344aa into eclair
* changes:
  Fixed
2009-12-11 13:29:37 -08:00
Dan Egnor
d0225ee63f 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.
2009-12-11 13:26:46 -08:00
Tom O'Neill
8fcfc7e8e6 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
2009-12-11 12:35:54 -08:00
Tom O'Neill
7f5c4a68ce 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
2009-12-11 12:31:25 -08:00
vchtchetkine
ecef8139de Fixed 2009-12-11 11:38:41 -08:00
Tom O'Neill
f2519b444f 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
2009-12-11 11:25:36 -08:00
Xavier Ducrohet
6264a9d4f0 am 320411d5: am 79ace486: am 7579e4af: Merge change I9fb303e6 into eclair
Merge commit '320411d59f78cb8f5b487614693aa260eaaa1653'

* commit '320411d59f78cb8f5b487614693aa260eaaa1653':
  Add new samples to the SDK.
2009-12-11 01:38:55 -08:00
Roman Nurik
b96f645ccb 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.
2009-12-11 01:38:51 -08:00
Trevor Johns
b8cd782342 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/.
2009-12-10 23:41:21 -08:00
David 'Digit' Turner
502474ec87 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.
2009-12-10 23:41:16 -08:00
Xavier Ducrohet
320411d59f 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.
2009-12-10 19:54:51 -08:00
Roman Nurik
8b13cf63d4 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.
2009-12-10 19:54:47 -08:00
Xavier Ducrohet
79ace48637 am 7579e4af: Merge change I9fb303e6 into eclair
Merge commit '7579e4afcff771ed7e137b46bd019acd581c9568' into eclair-mr2

* commit '7579e4afcff771ed7e137b46bd019acd581c9568':
  Add new samples to the SDK.
2009-12-10 19:48:51 -08:00
Roman Nurik
70634b3633 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.
2009-12-10 19:48:38 -08:00
Trevor Johns
ddedf9666e 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/.
2009-12-10 17:51:34 -08:00
David 'Digit' Turner
79c8d6bc06 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.
2009-12-10 17:51:30 -08:00
Trevor Johns
5f6b6bfb88 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/.
2009-12-10 17:44:35 -08:00
David 'Digit' Turner
04df8565bf 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.
2009-12-10 17:40:07 -08:00
Tom O'Neill
692736d4ae am 44e994e1: am 036832ad: Merge change Ic944ab1e into eclair-mr2
Merge commit '44e994e1d47deab75c19d8684e4da8398b448044'

* commit '44e994e1d47deab75c19d8684e4da8398b448044':
  Extract and check in NotepadCodeLab.zip for change tracking
2009-12-10 17:25:48 -08:00
Tom O'Neill
44e994e1d4 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
2009-12-10 17:21:48 -08:00
Xavier Ducrohet
13ea9404f4 am 7579e4af: Merge change I9fb303e6 into eclair
Merge commit '7579e4afcff771ed7e137b46bd019acd581c9568' into eclair-plus-aosp

* commit '7579e4afcff771ed7e137b46bd019acd581c9568':
  Add new samples to the SDK.
2009-12-10 17:16:53 -08:00
Android (Google) Code Review
036832adba Merge change Ic944ab1e into eclair-mr2
* changes:
  Extract and check in NotepadCodeLab.zip for change tracking
2009-12-10 17:16:32 -08:00
Romain Guy
63893a62cc am 764ff751: am dcf99fbe: Merge change If4ff28ed into eclair-mr2
Merge commit '764ff7513a47da76a59fee7c5f299afb7662aac6'

* commit '764ff7513a47da76a59fee7c5f299afb7662aac6':
  Cleanup one of the ListView sample demos.
2009-12-10 17:14:18 -08:00
Trevor Johns
879e646757 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
2009-12-10 17:14:13 -08:00
Android (Google) Code Review
7579e4afcf Merge change I9fb303e6 into eclair
* changes:
  Add new samples to the SDK.
2009-12-10 17:12:47 -08:00
Roman Nurik
aa89e73699 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.
2009-12-10 17:06:41 -08:00
Romain Guy
764ff7513a 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.
2009-12-10 16:58:46 -08:00
Trevor Johns
19d79f2fb4 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
2009-12-10 16:55:06 -08:00
Xavier Ducrohet
5a39638875 Add new samples to the SDK.
Change-Id: I9fb303e6b6f6fb00172f4f5bf64a2c56649c2491
2009-12-10 16:54:52 -08:00
Android (Google) Code Review
dcf99fbe7a Merge change If4ff28ed into eclair-mr2
* changes:
  Cleanup one of the ListView sample demos.
2009-12-10 16:51:41 -08:00
Trevor Johns
4eb4ed2d19 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
2009-12-10 16:45:44 -08:00
Romain Guy
f4ff28edda Cleanup one of the ListView sample demos. 2009-12-10 15:19:03 -08:00
Tom O'Neill
94b6d06899 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.
2009-12-10 11:02:57 -08:00
Ying Wang
a35897da6f 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.
2009-12-10 10:55:50 -08:00
Roman Nurik
e7e7a6b821 Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup. 2009-12-10 09:43:24 -08:00
Grace Kloba
276b14eee5 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
2009-12-09 18:37:51 -08:00
Jack Palevich
f86d78473f am 67250c0d: am 3c31d6cd: Simple Matrix Palette skinning sample.
Merge commit '67250c0d1fcf08f8dc507c269ba3974344db5883'

* commit '67250c0d1fcf08f8dc507c269ba3974344db5883':
  Simple Matrix Palette skinning sample.
2009-12-09 18:37:45 -08:00
Jack Palevich
a01ac2e7e3 resolved conflicts for merge of 59a3008a to master 2009-12-10 10:12:42 +08:00
Trevor Johns
a6db4b4643 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/.
2009-12-09 18:12:09 -08:00
Android (Google) Code Review
0359bdb72f Merge change I2b0bb983 into eclair
* changes:
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
2009-12-09 18:07:31 -08:00
Trevor Johns
54270ee63f am ed1bc094: am 37fbca22: am 5865825d: Merge change Iabe9529e into eclair
Merge commit 'ed1bc094cf0688a79ee9a9f030533986d2eff249'

* commit 'ed1bc094cf0688a79ee9a9f030533986d2eff249':
  Adding ContactManager sample to SDK samples.
2009-12-09 16:26:31 -08:00
Scott Main
919e46da86 am 8158980b: am 441b80ab: am 6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3'

* commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3':
  change the way bytes are read from InputStream.
2009-12-09 16:26:26 -08:00
James Yum
ee68f01a1d am 2a529126: am 1b5a89a2: am d2962a33: TextToSpeech API demo.
Merge commit '2a5291261163a7533097b80a6e5346f50ae2fe03'

* commit '2a5291261163a7533097b80a6e5346f50ae2fe03':
  TextToSpeech API demo.
2009-12-09 16:26:21 -08:00
Nicolas Catania
79726ff271 am 2bfd9db9: am 863270d1: Merge change I5ba25302 into eclair-mr2
Merge commit '2bfd9db950534a45b718f8939120a05ced5346f4'

* commit '2bfd9db950534a45b718f8939120a05ced5346f4':
  Added the new phone app unittest to runtest.
2009-12-09 16:26:15 -08:00
Derek Sollenberger
7d40a18f3f 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.
2009-12-09 16:26:09 -08:00
Dianne Hackborn
7466716279 am d564588d: am 579c7f19: Reorganize Service API demos.
Merge commit 'd564588d7dd6975e13037af5cec6c33f52c9e55d'

* commit 'd564588d7dd6975e13037af5cec6c33f52c9e55d':
  Reorganize Service API demos.
2009-12-09 16:26:02 -08:00
Andrew Stadler
e54051d957 resolved conflicts for merge of e85c304f to master 2009-12-09 16:10:02 -08:00
David 'Digit' Turner
e96f494a60 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.
2009-12-09 16:07:36 -08:00
Android (Google) Code Review
1fd97693dc Merge change Ia13e890e into eclair
* changes:
  Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
2009-12-09 16:02:14 -08:00