Andrew Hsieh
c0ca379b4f
am 1d979954: am 5d610bfe: am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"
...
* commit '1d97995429744e016d0f8296380c85c1167c51c2':
Refresh development/ndk/platforms/android-9/arch-x86/include/machine
2012-04-06 10:17:54 -07:00
Scott Main
7c4a6dca42
am c7f1356b: am 350b2b40: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit 'c7f1356b564ec04087b67df4e172ad25327e15ec':
2012-04-06 10:17:53 -07:00
Trevor Johns
ec215e8e4e
am 692d4d59: am 406c9c71: am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit '692d4d59b9052cff226ed1cf16d8298814c1bce8':
2012-04-06 10:17:52 -07:00
Scott Main
4ceddae3ae
am 57843593: am bb3a7738: am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit '5784359346aacc6226389932d4d96d85b217deba':
2012-04-06 10:17:52 -07:00
Scott Main
972f803a83
am 55951c14: am b2d2933c: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit '55951c14fccbbb6c196531c8f9a21e7e88dfc5a2':
2012-04-06 10:17:51 -07:00
Andrew Hsieh
1d97995429
am 5d610bfe: am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"
...
* commit '5d610bfe13f59cc886db16df91bef81df6c652af':
Refresh development/ndk/platforms/android-9/arch-x86/include/machine
2012-04-06 10:15:30 -07:00
Scott Main
c7f1356b56
am 350b2b40: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit '350b2b401dc860cef6f2ba363b5f027dd018a988':
2012-04-06 10:14:50 -07:00
Trevor Johns
692d4d59b9
am 406c9c71: am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit '406c9c7155b76806f7fd6c7b0d79e31e091081be':
2012-04-06 10:14:43 -07:00
Scott Main
5784359346
am bb3a7738: am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit 'bb3a773817872e4be651de680086464ca925c04b':
2012-04-06 10:14:39 -07:00
Scott Main
55951c14fc
am b2d2933c: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit 'b2d2933cfd492f3219dc4cb93f29ec9592429b15':
2012-04-06 10:14:38 -07:00
Scott Main
914c74dfd7
am 81fa100d: am 4480ff41: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit '81fa100d3fc5b82411b408a6b0631738699172e7':
2012-04-06 09:49:15 -07:00
Trevor Johns
b99641c2de
am ba0fe822: am 9dfe38c9: am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit 'ba0fe822673db1e2327bf8fd1c310cbc50c85c24':
2012-04-06 09:49:15 -07:00
Scott Main
75d9cfc90d
am 6b7d1a9a: am 7d5347aa: am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit '6b7d1a9a94ee0b80e2605c36718a5716b21ab389':
2012-04-06 09:49:14 -07:00
Scott Main
d77f3add21
am df30a52c: am b155ec3f: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit 'df30a52c7c526cf83e4313d0fc0680ae16ba0af6':
2012-04-06 09:49:13 -07:00
Scott Main
81fa100d3f
am 4480ff41: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit '4480ff413bd3b4a6c424883a5286ed7f3dd6cfd9':
Sample app for Android U class: Displaying Bitmaps Efficiently
2012-04-06 09:46:48 -07:00
Trevor Johns
ba0fe82267
am 9dfe38c9: am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit '9dfe38c943cf96bf79ee5c6fe38d94eb8beb1d7c':
Update activity-lifecycle sample: Use unique package name
2012-04-06 09:46:47 -07:00
Scott Main
6b7d1a9a94
am 7d5347aa: am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit '7d5347aaadd4f72bcea3dd017eb3b305f2fd507f':
uploading sample code for AU class on Activity Lifecycle
2012-04-06 09:46:47 -07:00
Scott Main
df30a52c7c
am b155ec3f: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit 'b155ec3ff6682454022c591017fbab0b8ddd1f68':
first draft of sample code for AU basic training class on fragments
2012-04-06 09:46:46 -07:00
Scott Main
4480ff413b
am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit 'cbece7322a7c74b74f2fc43cdff9bd9d7ab38632':
Sample app for Android U class: Displaying Bitmaps Efficiently
2012-04-06 09:43:00 -07:00
Trevor Johns
9dfe38c943
am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit 'a539e4e377cab1785b86af2f0260b63544fb6ff9':
Update activity-lifecycle sample: Use unique package name
2012-04-06 09:42:56 -07:00
Scott Main
7d5347aaad
am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit 'dfd2ae2278fba8654d9c8f81a16e8fb833c6e4f0':
uploading sample code for AU class on Activity Lifecycle
2012-04-06 09:42:53 -07:00
Scott Main
b155ec3ff6
am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit '96f6139c59b30755ca4e7d70bc34d6391eea8c2b':
first draft of sample code for AU basic training class on fragments
2012-04-06 09:42:53 -07:00
Andrew Hsieh
5d610bfe13
am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"
...
* commit '46ead86b0234fd514c7a1adc306ee37de00d59fb':
Refresh development/ndk/platforms/android-9/arch-x86/include/machine
2012-04-05 22:49:46 -07:00
Andrew Hsieh
46ead86b02
Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"
2012-04-05 22:30:09 -07:00
Andrew Hsieh
dab6072046
Refresh development/ndk/platforms/android-9/arch-x86/include/machine
...
Apply changes in bionic/libc/arch-x86/include/machine to
development/ndk/platforms/android-9/arch-x86/include/machine:
commit 5fbf2e09921723cfdea75e83c1fac2080f0ad564
Change-Id: Ie0fe711ae4c866d9c1300430d5e9613ccb82da22
2012-04-06 13:29:08 +08:00
satok
4216065458
Merge "Support sentence level spell check in sample code of the spell checker"
2012-04-05 21:13:40 -07:00
Jeff Brown
fd94c39a55
Merge "Use new input manager API."
2012-04-05 19:34:52 -07:00
Jeff Brown
001a30f89a
Use new input manager API.
...
Bug: 6110399
Change-Id: Icc0b2bb1261ce39809af6a2b78279b28d3a758c5
2012-04-05 18:50:00 -07:00
Eddy Talvala
a1e84accb5
Revert "Multi-project commit, other commits weren't ready after all. (Revert)"
...
This reverts commit f3785f1414
2012-04-05 18:06:40 -07:00
Adam Powell
e331666e3e
Move AppNavigation samples around
...
Move AppNavigation to SupportAppNavigation - this one uses the support
lib navigation helpers.
Add AppNavigation as an implementation of the same sample using the
framework features in JB.
Change-Id: I59e0f2e3e11ccccc277b177aee87bd88da8eb2c6
2012-04-05 18:03:24 -07:00
Eddy Talvala
a5a83d57e7
Merge "Multi-project commit, other commits weren't ready after all."
2012-04-05 16:47:59 -07:00
Eddy Talvala
f3785f1414
Multi-project commit, other commits weren't ready after all.
...
Revert "Add skeleton implementation of a fake v2 camera device."
This reverts commit 5a35e724fc
2012-04-05 16:45:02 -07:00
Eino-Ville Talvala
ea52f4fab4
Merge "Add skeleton implementation of a fake v2 camera device."
2012-04-05 16:30:20 -07:00
Eino-Ville Talvala
4eef3c7178
Merge "Camera emulator: Add timestamps to PreviewWindow output."
2012-04-05 16:30:12 -07:00
Eino-Ville Talvala
5a35e724fc
Add skeleton implementation of a fake v2 camera device.
...
Change-Id: I46df945117adef8d5c03846b1dd29435fa4c7d46
2012-04-05 16:04:29 -07:00
Stephen Hines
e5a517b5c9
Merge "Convert fp constants from double -> float."
2012-04-05 15:48:49 -07:00
Eino-Ville Talvala
5318919f7f
Camera emulator: Add timestamps to PreviewWindow output.
...
Change-Id: Ib0006fa98abebcc8ffa4b496a3bdd86b11e6c9be
2012-04-05 15:45:55 -07:00
Dianne Hackborn
34394c4bcc
Merge "Change video demo theme to dark."
2012-04-05 11:46:09 -07:00
Scott Main
a8b7ac98a0
am 4034cc8d: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit '4034cc8d3a2c7b06c872d786c58c022ab354828a':
Sample app for Android U class: Displaying Bitmaps Efficiently
2012-04-05 11:34:29 -07:00
Scott Main
4034cc8d3a
am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit 'cbece7322a7c74b74f2fc43cdff9bd9d7ab38632':
Sample app for Android U class: Displaying Bitmaps Efficiently
2012-04-05 11:32:00 -07:00
Scott Main
350b2b401d
am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit 'cbece7322a7c74b74f2fc43cdff9bd9d7ab38632':
Sample app for Android U class: Displaying Bitmaps Efficiently
2012-04-05 11:31:27 -07:00
Scott Main
cbece7322a
Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
2012-04-05 11:29:42 -07:00
The Android Automerger
a36d5d1ea9
merge in jb-release history after reset to master
2012-04-05 07:00:35 -07:00
satok
cd68d40846
Support sentence level spell check in sample code of the spell checker
...
Bug: 6136149
Change-Id: I1519258dd3ce95ad01e50a75f802469737bef3c4
2012-04-05 17:27:44 +09:00
Stephen Hines
92abb6399c
Convert fp constants from double -> float.
...
Change-Id: I5fff1660549473a45dafd3406f22005024655ad7
2012-04-04 22:28:35 -07:00
Trevor Johns
51635d3744
am a43ba915: am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit 'a43ba915490967c49bb4dbc6856964c1d83dee0b':
Update activity-lifecycle sample: Use unique package name
2012-04-04 17:47:16 -07:00
Trevor Johns
a43ba91549
am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit 'a539e4e377cab1785b86af2f0260b63544fb6ff9':
Update activity-lifecycle sample: Use unique package name
2012-04-04 17:39:48 -07:00
Trevor Johns
406c9c7155
am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit 'a539e4e377cab1785b86af2f0260b63544fb6ff9':
Update activity-lifecycle sample: Use unique package name
2012-04-04 17:39:20 -07:00
Trevor Johns
a539e4e377
Update activity-lifecycle sample: Use unique package name
...
Changing the package name for activity-lifecycle sample from
com.example.android to com.example.android.lifecycle.
Change-Id: I8c17762fde0895408da0b2e1b17b425bcb9e7abb
2012-04-04 17:21:53 -07:00
Scott Main
a787eec182
am 65aed21a: am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit '65aed21ac92ec70991d395652c69cbb04c9b2cac':
uploading sample code for AU class on Activity Lifecycle
2012-04-04 16:29:55 -07:00