Commit Graph

5340 Commits

Author SHA1 Message Date
Xavier Ducrohet
ecae4533f2 am 8841bf1d: (-s ours) am 7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
* commit '8841bf1d41f8bc2dee32d881121e1a1c9a15664a':
  Move SDK component to 2.4 - DO NOT MERGE.
2011-01-16 19:44:38 -08:00
Xavier Ducrohet
8841bf1d41 am 7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
* commit '7eada54037b5476bfc1cc4a3e8933defa0b04096':
  Move SDK component to 2.4 - DO NOT MERGE.
2011-01-16 19:42:37 -08:00
Xavier Ducrohet
0c0d4dfd12 am ac70efe3: Merge "Move SDK component to API 10 + codename." into honeycomb
* commit 'ac70efe3445dc697c521853af382624af63da457':
  Move SDK component to API 10 + codename.
2011-01-16 19:40:38 -08:00
Xavier Ducrohet
2f61f0b754 am ae71adc7: Merge "Fix WXGA skin" into honeycomb
* commit 'ae71adc7c815cc3965e424b6c8f9d93a4fd0af12':
  Fix WXGA skin
2011-01-16 19:40:36 -08:00
Xavier Ducrohet
ac70efe344 Merge "Move SDK component to API 10 + codename." into honeycomb 2011-01-16 19:38:59 -08:00
Xavier Ducrohet
7eada54037 Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread 2011-01-16 19:38:51 -08:00
Xavier Ducrohet
ae71adc7c8 Merge "Fix WXGA skin" into honeycomb 2011-01-16 19:38:41 -08:00
Xavier Ducrohet
7f712e3670 am a67b557e: Merge "Add RS includes to the SDK and update skin list." into honeycomb
* commit 'a67b557e13a11afc84beed873c7be4f2fac59643':
  Add RS includes to the SDK and update skin list.
2011-01-16 19:18:16 -08:00
Xavier Ducrohet
a67b557e13 Merge "Add RS includes to the SDK and update skin list." into honeycomb 2011-01-16 19:16:16 -08:00
Winson Chung
2c5a0a9cf1 am eb80909d: Adding WidgetPreview utility.
* commit 'eb80909dfc0d44d1bd6b38aea12b3740cea4efa9':
  Adding WidgetPreview utility.
2011-01-16 17:58:38 -08:00
Winson Chung
eb80909dfc Adding WidgetPreview utility.
Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
2011-01-16 17:13:16 -08:00
Xavier Ducrohet
0e58a80e38 Move SDK component to API 10 + codename.
Change-Id: If6c739a082c3c631de62d3c0db7615bcf29b4126
2011-01-16 15:27:25 -08:00
Xavier Ducrohet
22f3c41f71 Move SDK component to 2.4 - DO NOT MERGE.
Change-Id: Ibee46cfa081d81a7cc12f9b81ec0a3637f5b487f
2011-01-16 15:23:50 -08:00
Dianne Hackborn
b101f20ff2 am e63a4b58: Add some more API demos for themes.
* commit 'e63a4b58a26cdce8b62984c83763dafdf282895b':
  Add some more API demos for themes.
2011-01-16 14:49:50 -08:00
Dianne Hackborn
e63a4b58a2 Add some more API demos for themes.
Shows how to make a basic custom theme with a custom background,
and a theme that selects between the old theme and Holo.

Also use a little trick to make the API demos for HC specific
samples be hidden on older versions of the platform.

Change-Id: Ie53e8103147e81975fca73b96bda989a00504534
2011-01-16 14:29:28 -08:00
Xavier Ducrohet
0af60fc747 Fix WXGA skin
Change-Id: Ia283c1f9774318661c7164fdb9da70c72bb26bdc
2011-01-16 13:41:34 -08:00
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
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
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
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
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
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
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
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
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
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
ad60decc9d resolved conflicts for merge of c8e12573 to honeycomb-plus-aosp
Change-Id: I2ee1cb90df9617e470aec99671a05d99939f30f2
2011-01-12 16:31:35 -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
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