Commit Graph

3922 Commits

Author SHA1 Message Date
Tom O'Neill
1c66b17d88 Match the tutorial documentation more closely
Just undoing some white space changes that my previous CL introduced, in
order to keep the formatting the same between the tutorial documentation
and the actual code.
2009-12-17 11:20:00 -08:00
Dan Morrill
55de681445 Additional content massaging based on feedback received. 2009-12-16 17:56:38 -08:00
Grace Kloba
831940271a 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
2009-12-16 14:24:17 -08:00
Grace Kloba
6be651ee00 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
2009-12-16 14:21:19 -08:00
Android (Google) Code Review
3bc69e6256 Merge change Ib59457e0 into eclair-mr2
* changes:
  Change full screen surface to Opaque as it is required by the new plugin model.
2009-12-16 14:16:45 -08:00
Grace Kloba
b59457e055 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.
2009-12-16 11:38:53 -08:00
Android (Google) Code Review
068f3dd6a1 Merge change Ie8b10efd
* changes:
  Finish adding Makefiles for the Notepad tutorial.
2009-12-16 11:29:36 -08:00
Ying Wang
91f556a237 am 564c9930: am 53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2
Merge commit '564c993069fe049a755be7ecffa510fe64a1917e'

* commit '564c993069fe049a755be7ecffa510fe64a1917e':
  Package blacklist/whitelist file support for Monkey.
2009-12-16 11:12:46 -08:00
Ying Wang
564c993069 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.
2009-12-16 10:47:41 -08:00
Android (Google) Code Review
53a8ae6060 Merge changes I84cafc84,Idc388c56 into eclair-mr2
* changes:
  Merge commit 'goog/eclair-mr2' into play-with-monkey
  Package blacklist/whitelist file support for Monkey.
2009-12-16 10:43:43 -08:00
Tom O'Neill
77560fc704 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
2009-12-16 09:54:24 -08:00
Dirk Dougherty
a276296490 Merge commit 'e897c1b4' into manualmerge
Conflicts:
	samples/ApiDemos/src/com/example/android/apis/app/_index.html
2009-12-15 23:27:22 -08:00
Dirk Dougherty
e897c1b428 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.
2009-12-15 19:26:25 -08:00
Android (Google) Code Review
1d15167865 Merge change Ie8650e4b into eclair
* changes:
  sdk doc change for esr: fix some broken links to resources files.
2009-12-15 19:23:33 -08:00
Dirk Dougherty
0b1153b115 sdk doc change for esr: fix some broken links to resources files.
Bug: 2160782
Change-Id: Ie8650e4b642a96e67a2e7e62669282bc58d414ba
2009-12-15 18:47:00 -08:00
Trevor Johns
7a41627710 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.
2009-12-15 15:06:19 -08:00
Xavier Ducrohet
050eb28ab5 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.
2009-12-15 15:05:51 -08:00
Xavier Ducrohet
ba450c770e am 436be3f8: am 1162372c: Use the feature list for the SDK.
Merge commit '436be3f862065e67087fbc95fd75b03e0496cea3'

* commit '436be3f862065e67087fbc95fd75b03e0496cea3':
  Use the feature list for the SDK.
2009-12-15 15:04:36 -08:00
Trevor Johns
55d80586c7 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.
2009-12-15 12:17:03 -08:00
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