Xavier Ducrohet
14f3c60f50
Add RS includes to the SDK and update skin list.
...
Change-Id: Id453585e5c1f4d80336bd2fc837afbc7a0a0d097
2011-01-16 13:21:52 -08:00
Jaikumar Ganesh
7cba248813
am 9792c2d5: (-s ours) am 0d799e09: (-s ours) am 1b608620: Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
...
* commit '9792c2d58845e253743f8f9ff8d427370b8f277e':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-16 10:43:06 -08:00
Elliott Hughes
9400acc4d4
am a467ad21: am 47081d8f: am ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
...
* commit 'a467ad214adf0cdd9ac351acb7de473fe01d3976':
Minor doc fixes (mainly the infamous "repo init-u").
2011-01-16 10:42:59 -08:00
Jaikumar Ganesh
9792c2d588
am 0d799e09: (-s ours) am 1b608620: Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
...
* commit '0d799e0964368f67b6ec1d6d3fac90d061a7d160':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-14 21:30:01 -08:00
Elliott Hughes
a467ad214a
am 47081d8f: am ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
...
* commit '47081d8f5878ca5e2ee6c52a92401498a72323f4':
Minor doc fixes (mainly the infamous "repo init-u").
2011-01-14 21:29:17 -08:00
Jack Palevich
2f6e41d664
Add BasicGLSurfaceView sample.
...
Show how to get started with OpenGL ES 2.0.
Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
2011-01-14 19:27:56 -08:00
Jaikumar Ganesh
0d799e0964
am 1b608620: Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
...
* commit '1b6086207f2b06fb2647428e6210c2aefc6a930a':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-14 16:13:36 -08:00
Jaikumar Ganesh
1b6086207f
Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
2011-01-14 16:11:35 -08:00
Elliott Hughes
47081d8f58
am ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
...
* commit 'ed6b76c670658390a43e199f9dc199d85483300a':
Minor doc fixes (mainly the infamous "repo init-u").
2011-01-14 14:21:04 -08:00
Elliott Hughes
ed6b76c670
Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
2011-01-14 14:19:03 -08:00
Jaikumar Ganesh
6314c20eeb
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
...
Also fix some bugs.
Bug: 3352266
Change-Id: Ie64cb243159b1f6eea5f268f02a1dd58970d1e22
2011-01-14 13:11:34 -08:00
Christopher Tate
86e2451d1c
am eb3c9bb4: am 560094ef: Merge "Add a dynamically-revealed view to the drag demo" into honeycomb
...
* commit 'eb3c9bb439166ef17450e4e9fb4d8fa2d96b6ef3':
Add a dynamically-revealed view to the drag demo
2011-01-14 12:40:37 -08:00
Christopher Tate
eb3c9bb439
am 560094ef: Merge "Add a dynamically-revealed view to the drag demo" into honeycomb
...
* commit '560094efef3da5f616faed00212f8fdae9037d99':
Add a dynamically-revealed view to the drag demo
2011-01-14 12:38:21 -08:00
Christopher Tate
560094efef
Merge "Add a dynamically-revealed view to the drag demo" into honeycomb
2011-01-14 12:36:49 -08:00
Raphael
285c373b8e
am 04e38c29: am c3035696: Merge "Add llvm-rs-cc to the SDK (all platforms)" into honeycomb
...
* commit '04e38c292f91435b377805ae1080b35cf2051566':
Add llvm-rs-cc to the SDK (all platforms)
2011-01-14 10:19:53 -08:00
Raphael
04e38c292f
am c3035696: Merge "Add llvm-rs-cc to the SDK (all platforms)" into honeycomb
...
* commit 'c3035696a2f7d5d2ea9aa1c5ef376b0ee962d60c':
Add llvm-rs-cc to the SDK (all platforms)
2011-01-14 10:18:15 -08:00
Raphael
c3035696a2
Merge "Add llvm-rs-cc to the SDK (all platforms)" into honeycomb
2011-01-14 10:16:59 -08:00
Wink Saville
181414a48c
Fix build.
...
Commented out the offending lines and add a RuntimeException to
fix the build.
Change-Id: Ide2a7897d639edb1cd28401566558a90235c250b
2011-01-13 21:05:24 -08:00
Christopher Tate
cbbfda2bd0
Add a dynamically-revealed view to the drag demo
...
This is to show off and test the handling of views that become
visible after the primary ACTION_DRAG_STARTED broadcast happens.
Change-Id: I8bb575c2e055a9d60fc6ed8bc77457dec13a80b4
2011-01-13 20:28:47 -08:00
Jake Hamby
a7f9d6622d
am c09e5a4e: am 3695fe3a: Fix BT chat sample app to use Honeycomb action bar.
...
* commit 'c09e5a4ec9a9d51afbc4e97d8fdb0a8cc924594b':
Fix BT chat sample app to use Honeycomb action bar.
2011-01-13 17:48:22 -08:00
Jake Hamby
c09e5a4ec9
am 3695fe3a: Fix BT chat sample app to use Honeycomb action bar.
...
* commit '3695fe3a4242504d523d0222306775ada5cd6430':
Fix BT chat sample app to use Honeycomb action bar.
2011-01-13 17:46:33 -08:00
Jake Hamby
3695fe3a42
Fix BT chat sample app to use Honeycomb action bar.
...
The BT chat app previously used a custom title, which is no longer
supported in Honeycomb with the default theme. It also required the
option menu, which has been replaced with the action bar.
Fixed the app to use the standard Honeycomb style and action bar.
Bug: 3098795
Change-Id: I8f8656b261c6e15cc6b0b2f445087ff3baabb4d4
2011-01-13 16:59:47 -08:00
Raphael
32d597b5b7
Add llvm-rs-cc to the SDK (all platforms)
...
Change-Id: I6077251d0a34678e708ddd25068a511159ba7460
2011-01-13 16:59:09 -08:00
Jeff Hamilton
5718f39cfd
am b0a4fe01: am e8b4ac2e: am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
...
* commit 'b0a4fe0141312f400f6e4b02f79999b24c44743b':
Add a sample for the NFC foreground dispatch APIs.
2011-01-13 12:51:02 -08:00
Jeff Hamilton
b0a4fe0141
am e8b4ac2e: am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
...
* commit 'e8b4ac2e6d04cc4651c8b0852d8bcf02c4e5019a':
Add a sample for the NFC foreground dispatch APIs.
2011-01-13 12:48:30 -08:00
Jeff Hamilton
e8b4ac2e6d
am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
...
* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
Add a sample for the NFC foreground dispatch APIs.
2011-01-13 12:46:08 -08:00
Jeff Hamilton
aad3a1b732
Add a sample for the NFC foreground dispatch APIs.
...
Change-Id: Iee532d53b4d9354977414b0302b386a940606ab3
2011-01-13 14:39:58 -06:00
Andy Stadler
3086995972
am 36a3d061: am 3eb48a06: Add encryption status controls
...
* commit '36a3d06181c35f0f5ff42338b2995bd764deddd1':
Add encryption status controls
2011-01-12 21:20:54 -08:00
Andy Stadler
36a3d06181
am 3eb48a06: Add encryption status controls
...
* commit '3eb48a061aa2d6aafe7493bb3d83ea8f8d53a33d':
Add encryption status controls
2011-01-12 21:19:06 -08:00
Andy Stadler
3eb48a061a
Add encryption status controls
...
* Enable, disable, and activate encryption
* Report encryption status
Change-Id: Ia76cf6033fe00ebdfd3369f8123f5d1ec109f3a9
2011-01-12 20:41:20 -08:00
Scott Main
797b5167dc
am c0a02d4d: am d911d881: Merge "docs: add section links to samples overview" into honeycomb
...
* commit 'c0a02d4df1a45281fabda85bc339dbf6b51088fd':
docs: add section links to samples overview
2011-01-12 19:14:28 -08:00
Scott Main
c0a02d4df1
am d911d881: Merge "docs: add section links to samples overview" into honeycomb
...
* commit 'd911d8812a9fa51d02545ad538a1d87ba9690cf8':
docs: add section links to samples overview
2011-01-12 19:12:07 -08:00
Scott Main
d911d8812a
Merge "docs: add section links to samples overview" into honeycomb
2011-01-12 19:09:37 -08:00
Scott Main
12d6751cc7
am ad60decc: resolved conflicts for merge of c8e12573 to honeycomb-plus-aosp
...
* commit 'ad60decc9dd6c58848b4de2494cdd64878ee71d8':
update notepad menu icons with new styles for GB (20% smaller)
2011-01-12 16:57:57 -08:00
Scott Main
ad60decc9d
resolved conflicts for merge of c8e12573 to honeycomb-plus-aosp
...
Change-Id: I2ee1cb90df9617e470aec99671a05d99939f30f2
2011-01-12 16:31:35 -08:00
Dan Bornstein
65f0ed3a3e
am ed5b6974: am d24e1aea: Happy new year!
...
* commit 'ed5b6974808e8151e275bbb20065af50edcd997b':
Happy new year!
2011-01-12 10:41:44 -08:00
Dan Bornstein
ed5b697480
am d24e1aea: Happy new year!
...
* commit 'd24e1aeaa6c302e978da9e5a4b7afd0d9906133d':
Happy new year!
2011-01-12 10:39:53 -08:00
Dan Bornstein
d24e1aeaa6
Happy new year!
...
Change-Id: I6daf044398620f2de3f186f77c0984c96eb8c501
2011-01-12 10:35:32 -08:00
Raphael
f73364d547
am d593859d: (-s ours) am 765487f3: (-s ours) am f823ebad: Switch GB SDK to 2.4 / API 10. Do not merge.
...
* commit 'd593859ded1cd9c4f663c8462c10645806e2cb8e':
Switch GB SDK to 2.4 / API 10. Do not merge.
2011-01-12 00:07:56 -08:00
Raphael
d593859ded
am 765487f3: (-s ours) am f823ebad: Switch GB SDK to 2.4 / API 10. Do not merge.
...
* commit '765487f3817773d5e994ee148cc6e87ee6e9ee69':
Switch GB SDK to 2.4 / API 10. Do not merge.
2011-01-12 00:04:30 -08:00
Scott Main
3ea03c5321
docs: add section links to samples overview
...
Change-Id: Ib605362eb97e607eba3d965a5ca0f32e6207b841
2011-01-11 21:09:53 -08:00
Christopher Tate
1903df7cc5
am 134fada4: API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
...
* commit '134fada434cae8dc5a00b91cb5ff0541de94ea64':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
2011-01-11 20:06:03 -08:00
Elliott Hughes
c8887c191a
Minor doc fixes (mainly the infamous "repo init-u").
...
Bug: http://code.google.com/p/android/issues/detail?id=8769
Change-Id: I6924baf82cc6939ba51e0b01af1f5f3c56106a5d
2011-01-11 18:10:17 -08:00
Christopher Tate
134fada434
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
...
startDrag() that crosses application boundaries will remain @hide until we get
more of the surrounding behaviors nailed down.
Drag-and-drop demo updated to only show app-local drag operations pro tem.
Change-Id: I9cdcd132c1aae45bc472e70293b7187b4cba9bca
2011-01-11 17:49:20 -08:00
Xavier Ducrohet
cf3552e053
am 8bd51121: am daf0b895: Cherry-pick f0e5e933 from master.
...
* commit '8bd511218db56fc6e6bc1c383758577de7b4e657':
Cherry-pick f0e5e933 from master.
2011-01-11 13:52:39 -08:00
Chet Haase
1c9f9f1796
am d8126c7d: All animator resources moved to res/animator
...
* commit 'd8126c7d899e340c2dba023250a68fed56db7d11':
All animator resources moved to res/animator
2011-01-11 13:16:48 -08:00
Chet Haase
d8126c7d89
All animator resources moved to res/animator
...
Change-Id: I84ea32b1560041a30195067971f02cf9e780d853
2011-01-11 07:20:55 -08:00
Chet Haase
678b7241cb
am 6e27f585: Rename RGBEvaluator to ArgbEvaluator
...
* commit '6e27f5856a9096a475039966106aec6546e6e277':
Rename RGBEvaluator to ArgbEvaluator
2011-01-11 07:07:35 -08:00
Chet Haase
6e27f5856a
Rename RGBEvaluator to ArgbEvaluator
...
Change-Id: I43cf6c9824b012424de1ef2a340ee9dde20af4a7
2011-01-10 16:48:48 -08:00
Jean-Baptiste Queru
4a3fe4a96a
skip e36ba37e from gingerbread-plus-aosp
...
Change-Id: Ib37cf1c4a07edbeed6a416fb9a82c2fb61cecf2d
2011-01-10 15:31:59 -08:00