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
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
Scott Main
65aed21ac9
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-04 16:27:33 -07:00
Scott Main
bb3a773817
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-04 16:27:18 -07:00
Scott Main
51f7a25269
am 1a669bdf: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit '1a669bdf66bc93f2af6aafa91d605fb6713f1b9b':
first draft of sample code for AU basic training class on fragments
2012-04-04 16:27:03 -07:00
Scott Main
dfd2ae2278
Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
2012-04-04 16:25:14 -07:00
Scott Main
1a669bdf66
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-04 16:24:41 -07:00
Scott Main
b2d2933cfd
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-04 16:24:28 -07:00
Scott Main
96f6139c59
Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
2012-04-04 16:22:49 -07:00
Fred Chung
3a4f89cc9f
am e359b370: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit 'e359b3701bd144ea22ebc6551c8b35b7d99324db':
2012-04-04 14:56:42 -07:00
Xavier Ducrohet
34f38a5cdd
am 4db20997: am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
...
* commit '4db20997681bbb2c7a16e1c7d50b1a1901496144':
Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:06:28 -07:00
Xavier Ducrohet
4db2099768
am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
...
* commit 'e3e74aa50e74a3465295b9405ea0fccca62472a1':
Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:03:32 -07:00
Xavier Ducrohet
e3e74aa50e
am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
...
* commit '2a57c79366dcdac42e330a8af752e44410556f31':
Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:01:30 -07:00
Dianne Hackborn
16bb30e381
Merge "Use fitsSystemWindows for better demoing."
2012-04-04 13:55:08 -07:00
Dianne Hackborn
6ad1018f20
Use fitsSystemWindows for better demoing.
...
Change-Id: I3b9e5068401e0ac1cd1d631434fe1514e8996ee3
2012-04-04 13:30:44 -07:00
Xavier Ducrohet
2a57c79366
Merge "Move stuff from prebuilt to prebuilts/tools"
2012-04-04 13:02:37 -07:00
Tsu Chiang Chuang
f4258608ea
Merge "Add new way to calculate FPS to monkey."
2012-04-04 12:55:44 -07:00
Fred Chung
a41048780a
am c7935836: am 42f0a7ed: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit 'c793583628c16215891bb137de96dc0500f12c6a':
2012-04-04 12:46:36 -07:00
Fred Chung
68b225a5c0
am 4f5f461b: am d074f750: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit '4f5f461b159b993455976a623617dffdd5e20c2a':
Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:46:35 -07:00
Fred Chung
c793583628
am 42f0a7ed: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit '42f0a7ed931a977da46f71d26dc5f57835a7bdd5':
2012-04-04 12:44:47 -07:00
Fred Chung
4f5f461b15
am d074f750: am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit 'd074f7505ed6614689e9204c87d6be90584f267f':
Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:44:14 -07:00
Fred Chung
e359b3701b
am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:41:43 -07:00
Fred Chung
d074f7505e
am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:41:37 -07:00
Fred Chung
42f0a7ed93
am 607ac0bc: Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
...
* commit '607ac0bc7caaf02851f5ebb6b2a883491e2527e3':
Sample app for Android Training lesson: Making your app location aware.
2012-04-04 12:41:05 -07:00
Fred Chung
607ac0bc7c
Merge "Sample app for Android Training lesson: Making your app location aware." into ics-mr1
2012-04-04 12:39:21 -07:00
Scott Main
4fa3ad83bf
am b0f4513b: am 202b6523: docs: add GP Licensing redirect
...
* commit 'b0f4513b843d379bd7ce861855f8f9a7c17e72d6':
2012-04-04 11:31:14 -07:00