Commit Graph

5103 Commits

Author SHA1 Message Date
Android (Google) Code Review
5dba584a08 Merge change Ic3464854 into eclair
* changes:
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
2009-12-15 12:13:54 -08:00
Xavier Ducrohet
cf4e98b260 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.
2009-12-15 10:33:08 -08:00
Xavier Ducrohet
436be3f862 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.
2009-12-15 07:42:50 -08:00
Android Git Automerger
900a83500e Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:45:10 -08:00
Trevor Johns
0ed0224e24 Renaming com.google.example.android.contactmanager to com.example.android.contactmanager. 2009-12-14 23:25:59 -08:00
Xavier Ducrohet
b84cf9e1e3 Clean up the SDK and make it compiled and installed in the SDK system image.
Change-Id: I6e5f01a1cc45beada70608307f4ac38a4dcdd0b9
2009-12-14 22:36:44 -08:00
Fred Quintana
dd9de1c60b 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
2009-12-14 18:18:24 -08:00
Xavier Ducrohet
1162372c9e Use the feature list for the SDK.
Change-Id: I926a682ac23a373276d10223af9f1e47ebc617d0
2009-12-14 18:01:14 -08:00
Fred Quintana
f5fc8b0601 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
2009-12-14 16:37:58 -08:00
Ying Wang
dc388c565b Merge commit 'goog/eclair-mr2' into play-with-monkey
Conflicts:

	cmds/monkey/src/com/android/commands/monkey/Monkey.java
2009-12-14 16:23:32 -08:00
Tom O'Neill
4dfa6b7d2e am ba192890: am 5595acbe: Merge change Ice325f3b into eclair-mr2
Merge commit 'ba192890472dbb92c01d596633571fe2f074d759'

* commit 'ba192890472dbb92c01d596633571fe2f074d759':
  Fix Notepadv3Solution orientation changes during NoteEdit
2009-12-14 15:33:01 -08:00
Tom O'Neill
ba19289047 am 5595acbe: Merge change Ice325f3b into eclair-mr2
Merge commit '5595acbed8ca1778a61881a00d7baaffecb2a64c' into eclair-mr2-plus-aosp

* commit '5595acbed8ca1778a61881a00d7baaffecb2a64c':
  Fix Notepadv3Solution orientation changes during NoteEdit
2009-12-14 15:24:09 -08:00
Fred Quintana
7dbb3c2900 moved the hidden sync helpers out of the framework 2009-12-14 14:31:47 -08:00
Android (Google) Code Review
5595acbed8 Merge change Ice325f3b into eclair-mr2
* changes:
  Fix Notepadv3Solution orientation changes during NoteEdit
2009-12-14 11:50:14 -08:00
vchtchetkine
256c1afab0 am 51afa32c: am ec30731d: am 2276398d: Merge change I0d9344aa into eclair
Merge commit '51afa32c69aca2206578f363af50753f59d19574'

* commit '51afa32c69aca2206578f363af50753f59d19574':
  Fixed
2009-12-13 12:38:47 -08:00
vchtchetkine
51afa32c69 am ec30731d: am 2276398d: Merge change I0d9344aa into eclair
Merge commit 'ec30731d8f415a427f15280bdc14ea6c54f5904d' into eclair-mr2-plus-aosp

* commit 'ec30731d8f415a427f15280bdc14ea6c54f5904d':
  Fixed
2009-12-13 12:32:03 -08:00
vchtchetkine
ec30731d8f am 2276398d: Merge change I0d9344aa into eclair
Merge commit '2276398db0b0208b7627dc436ecc9e6c09e68107' into eclair-mr2

* commit '2276398db0b0208b7627dc436ecc9e6c09e68107':
  Fixed
2009-12-13 12:23:31 -08:00
Tom O'Neill
7c21d1cd40 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
2009-12-11 16:03:52 -08:00
Dan Egnor
f8c609c729 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
2009-12-11 14:28:02 -08:00
Dan Egnor
6c9e7af472 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
2009-12-11 14:22:33 -08:00
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