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
Scott Main
c8e1257329
am ac96a560: Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread
...
* commit 'ac96a5607de2fd643bdf43e1711aea8afa74c04b':
update notepad menu icons with new styles for GB (20% smaller)
2011-01-10 13:36:20 -08:00
Scott Main
ac96a5607d
Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread
2011-01-10 13:33:08 -08:00
Raphael
765487f381
am f823ebad: Switch GB SDK to 2.4 / API 10. Do not merge.
...
* commit 'f823ebad02e2d699490dc7e975054146c67251cc':
Switch GB SDK to 2.4 / API 10. Do not merge.
2011-01-10 11:03:59 -08:00
Raphael
7f9bab8c45
am 5cb35294: Merge "SDK bump plat-tools." into honeycomb
...
* commit '5cb35294ed4947bbc56ae89056074556159ca56a':
SDK bump plat-tools.
2011-01-10 11:03:17 -08:00
Raphael
5cb35294ed
Merge "SDK bump plat-tools." into honeycomb
2011-01-10 11:01:00 -08:00
Xavier Ducrohet
a0b559c50b
am fd28b70b: Merge "Update source.properties for the Samples." into honeycomb
...
* commit 'fd28b70b477e534bbebd5d40ddeca030d74bdc4b':
Update source.properties for the Samples.
2011-01-09 17:49:58 -08:00
Xavier Ducrohet
fd28b70b47
Merge "Update source.properties for the Samples." into honeycomb
2011-01-09 17:48:11 -08:00
Xavier Ducrohet
e039eac65a
Update source.properties for the Samples.
...
Change-Id: Id250d5e1b8a9460314e0ebd9615048e5e4e3bd87
2011-01-09 17:34:21 -08:00
Brett Chabot
661d0897a3
am 8ad7359b: Merge "Replace use of ro.monkey with ro.test_harness." into honeycomb
...
* commit '8ad7359b2f61d0be4bfca700393179e61c8d68a4':
Replace use of ro.monkey with ro.test_harness.
2011-01-09 16:32:14 -08:00
Brett Chabot
8ad7359b2f
Merge "Replace use of ro.monkey with ro.test_harness." into honeycomb
2011-01-09 16:29:57 -08:00
Brett Chabot
b45644eac0
Replace use of ro.monkey with ro.test_harness.
...
Bug 3329873
Change-Id: Ia681803c3d0b0afeceb178b8314c9d7227d99355
2011-01-09 14:11:50 -08:00
Dianne Hackborn
e26dafe897
am 69c72dfd: Clean up from comments, enable throttling.
...
* commit '69c72dfdf901e07a132f3ad4856c2058e5efa2e9':
Clean up from comments, enable throttling.
2011-01-09 11:42:22 -08:00
Dianne Hackborn
69c72dfdf9
Clean up from comments, enable throttling.
...
Change-Id: I719b0491a7953ab57d76634699c6fdf3ad8558e0
2011-01-08 18:34:43 -08:00
Dianne Hackborn
b346431189
am ddfb4b38: Merge "Clean up to no longer use old APIs, add new loader throttle sample." into honeycomb
...
* commit 'ddfb4b38f5935fe19b08597926aa90eb2ce6c43c':
Clean up to no longer use old APIs, add new loader throttle sample.
2011-01-08 17:36:45 -08:00
Dianne Hackborn
ddfb4b38f5
Merge "Clean up to no longer use old APIs, add new loader throttle sample." into honeycomb
2011-01-08 17:35:08 -08:00
Dianne Hackborn
4fd816a7ba
Clean up to no longer use old APIs, add new loader throttle sample.
...
The new sample code is a complete self-contained end-to-end
implementation of a content provider populating a list view
through a loader, dynamically changing its contents based on
user input in about 500 lines.
Once the framework support is implemented, this will demonstrate
using CursorLoader's new throttling feature.
Change-Id: Ia67da7284607477125c613c3135f93bc1d95d0cb
2011-01-08 17:33:13 -08:00
Adam Powell
e2f45f5c5e
am e4d6bfae: Update dialog demos for API changes related to setting themed icons.
...
* commit 'e4d6bfae6565949bca6b39a5a559095e95698415':
Update dialog demos for API changes related to setting themed icons.
2011-01-08 13:32:52 -08:00
Adam Powell
e4d6bfae65
Update dialog demos for API changes related to setting themed icons.
...
Change-Id: I73213f9593a381bd43b935aa2fa020ec3d6095d7
2011-01-08 13:29:50 -08:00
Eric Fischer
5a1575acb4
am af165072: (-s ours) am 01f08464: Import translations for additional languages.
...
* commit 'af165072daa875844fada3b589709f4407a97e43':
Import translations for additional languages.
2011-01-08 05:24:04 -08:00
Xavier Ducrohet
cbc684043c
am 4711d1ef: Merge "Update heapSize for WXGA skin." into honeycomb
...
* commit '4711d1efd38a2b4aa03d8e9c391139cf11df8358':
Update heapSize for WXGA skin.
2011-01-07 17:14:36 -08:00
Xavier Ducrohet
4711d1efd3
Merge "Update heapSize for WXGA skin." into honeycomb
2011-01-07 17:13:07 -08:00
Christopher Tate
bff338e3e9
am 7f68ce1a: Rename drag "thumbnail" to the drag "shadow"
...
* commit '7f68ce1a1913bb8ffa13cf518b0daaa1bcf5eb4d':
Rename drag "thumbnail" to the drag "shadow"
2011-01-07 16:38:12 -08:00
Christopher Tate
7f68ce1a19
Rename drag "thumbnail" to the drag "shadow"
...
No functional changes; just a rename of the relevant class/method/parameters.
Change-Id: I506f8b541027cf104553c27547d3e9972cd1add8
2011-01-07 16:31:04 -08:00
Raphael
f823ebad02
Switch GB SDK to 2.4 / API 10. Do not merge.
...
Change-Id: I8e3c97c5c281b05e2e03b6739221ea8b13536bd3
2011-01-07 16:08:05 -08:00
Raphael
aa4aff93b4
SDK bump plat-tools.
...
Change-Id: I100ef5667d8c7f7e75748731464761021e61219e
2011-01-07 15:47:37 -08:00
Xavier Ducrohet
29ad0f4e6c
Update heapSize for WXGA skin.
...
Change-Id: I8c0f376535d0e0969b02bd774b52a1bbbdeb7fc6
2011-01-07 15:07:47 -08:00
Xavier Ducrohet
97ba533ada
am 9709bd22: Add WXGA skin.
...
* commit '9709bd228b32ac82c640e95b04a2c48406c472c6':
Add WXGA skin.
2011-01-07 14:51:03 -08:00
Xavier Ducrohet
9709bd228b
Add WXGA skin.
...
Change-Id: I29e62d5a1bf9d5017bfdca9fe07ae4e3124f951c
2011-01-07 14:37:37 -08:00
Xavier Ducrohet
cb0dec6428
am e81b589a: Merge "Cherry-pick f0e5e933 from master." into honeycomb
...
* commit 'e81b589ac20347a6d5e6c170d6de842f592b3c2f':
Cherry-pick f0e5e933 from master.
2011-01-07 13:56:55 -08:00
Xavier Ducrohet
8bd511218d
am daf0b895: Cherry-pick f0e5e933 from master.
...
* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
Cherry-pick f0e5e933 from master.
2011-01-07 13:50:42 -08:00