Merge commit '04df8565bf8f2b81a632fcd736cb96c8da478b9e' into eclair-mr2-plus-aosp
* commit '04df8565bf8f2b81a632fcd736cb96c8da478b9e':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Merge commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-mr2
* commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Merge commit '036832adba9d953f8d34ece1bd5b049f02437928' into eclair-mr2-plus-aosp
* commit '036832adba9d953f8d34ece1bd5b049f02437928':
Extract and check in NotepadCodeLab.zip for change tracking
Merge commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a' into eclair-mr2-plus-aosp
* commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a':
Cleanup one of the ListView sample demos.
Merge commit '4eb4ed2d19c498998bb9560c71873fa6657d0644' into eclair-mr2-plus-aosp
* commit '4eb4ed2d19c498998bb9560c71873fa6657d0644':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-mr2
* commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
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.
Merge commit '2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5' into eclair-mr2-plus-aosp
* commit '2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5':
Update SampleBrowserPlugin to show handling
Merge commit '441b80ab3795cb9f02afa7a7397dccd7c17c0cdd' into eclair-mr2-plus-aosp
* commit '441b80ab3795cb9f02afa7a7397dccd7c17c0cdd':
change the way bytes are read from InputStream.
Merge commit '863270d143ab4d496029f8417094187061e74ef2' into eclair-mr2-plus-aosp
* commit '863270d143ab4d496029f8417094187061e74ef2':
Added the new phone app unittest to runtest.
Merge commit 'e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f' into eclair-mr2-plus-aosp
* commit 'e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f':
updating sample plugin to use new full screen interfaces.
Merge commit '579c7f19ac379294822b976b73fe4037f40eba82' into eclair-mr2-plus-aosp
* commit '579c7f19ac379294822b976b73fe4037f40eba82':
Reorganize Service API demos.
Original code by Jeffrey Sharkey <jsharkey@android.com>.
Modifications:
- Remove .classpath, .project, and default.properties.
- Remove generated files (/gen).
- Create Android.mk and _index.html.
- Cleaned up whitespace and converted to match AOSP style guide.
- Renamed SimpleWiktionary to WiktionarySimple to keep both samples next to each other in the
directory listing.
- Removed the android:text attribute in the BulletPoint due to localization issues.
Merge commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-mr2
* commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
change the way bytes are read from InputStream.
* changes:
change the way bytes are read from InputStream. Read only the bytes received and don't allocate new arrays Also revise the mechanism for writing the outgoing messages to the screen to be more consistent with reading and cleanup line lengths to be <100 chars.
Read only the bytes received and don't allocate new arrays
Also revise the mechanism for writing the outgoing messages
to the screen to be more consistent with reading and
cleanup line lengths to be <100 chars.
Merge commit 'bd642f3e94f4cb94cbb48646ae61da5f6b18a093' into eclair-mr2-plus-aosp
* commit 'bd642f3e94f4cb94cbb48646ae61da5f6b18a093':
Make the simulator use alsa instead of esound.
Merge commit '0ee41ccc1429b83c6ab62cb99e081826a94741e8' into eclair-mr2-plus-aosp
* commit '0ee41ccc1429b83c6ab62cb99e081826a94741e8':
Fix the camera preview demo.
