OSDN Git Service
Alexander Lucas [Fri, 28 Jan 2011 02:28:36 +0000 (18:28 -0800)]
am
a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
* commit '
a057567484888f206cd70ecc2dcb269b16f23718':
For SipDemo sample code: Changed chosen image for "selected" state of talk button
Jack Palevich [Thu, 27 Jan 2011 17:18:16 +0000 (09:18 -0800)]
am
5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
* commit '
5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
Xavier Ducrohet [Thu, 27 Jan 2011 16:48:40 +0000 (08:48 -0800)]
am
7eada540: (-s ours) Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
* commit '
7eada54037b5476bfc1cc4a3e8933defa0b04096':
Move SDK component to 2.4 - DO NOT MERGE.
Jaikumar Ganesh [Thu, 27 Jan 2011 16:12:00 +0000 (08:12 -0800)]
am
1b608620: (-s ours) 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.
Elliott Hughes [Thu, 27 Jan 2011 16:10:42 +0000 (08:10 -0800)]
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").
Jeff Hamilton [Thu, 27 Jan 2011 05:14:42 +0000 (21:14 -0800)]
am
aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
* commit '
aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
Add a sample for the NFC foreground dispatch APIs.
Jeff Hamilton [Wed, 26 Jan 2011 17:12:41 +0000 (11:12 -0600)]
resolved conflicts for merge of
ac96a560 to honeycomb-merge
Change-Id: Ibc0b1fa69597672293f6b753f18f8a14ee732d0b
Raphael [Tue, 25 Jan 2011 23:52:23 +0000 (15:52 -0800)]
am
f823ebad: (-s ours) Switch GB SDK to 2.4 / API 10. Do not merge.
* commit '
f823ebad02e2d699490dc7e975054146c67251cc':
Switch GB SDK to 2.4 / API 10. Do not merge.
Xavier Ducrohet [Tue, 25 Jan 2011 23:39:11 +0000 (15:39 -0800)]
am
daf0b895: (-s ours) Cherry-pick
f0e5e933 from
* commit '
daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
Cherry-pick
f0e5e933 from master.
Raphael [Tue, 25 Jan 2011 23:21:18 +0000 (15:21 -0800)]
am
89ee8c72: (-s ours) Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread
* commit '
89ee8c72f35907a3546fb067eef2bdc8e134d53b':
SDK for 2.3.1 -- DO NOT MERGE
Eric Fischer [Tue, 25 Jan 2011 20:52:19 +0000 (12:52 -0800)]
am
01f08464: (-s ours) Import translations for additional languages.
* commit '
01f0846415ed75a8e30a26bf5e064c46025df2eb':
Import translations for additional languages.
Yu Shan Emily Lau [Mon, 24 Jan 2011 19:52:51 +0000 (11:52 -0800)]
Fixed the appCrashBugreport reset flag. Bug#
3383876
Change-Id: I51d06ad30ed43789943cc99744898028e11b8466
Dianne Hackborn [Sun, 23 Jan 2011 21:28:02 +0000 (13:28 -0800)]
Remove use of old theme name.
Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
Ed Heyl [Fri, 21 Jan 2011 03:10:22 +0000 (19:10 -0800)]
Merge "Really don't send POWER or ENDCALL." into honeycomb
Adam Powell [Fri, 21 Jan 2011 02:36:37 +0000 (18:36 -0800)]
API change - bug
3370353 and bug
3370338
Change-Id: I9da53f3260ca17713e793b420e477686ad23c7d3
Jeff Brown [Fri, 21 Jan 2011 01:41:18 +0000 (17:41 -0800)]
Really don't send POWER or ENDCALL.
Change-Id: If55c6bc7565a9a6b493da16fac5c7ad3c621684f
Yu Shan Emily Lau [Thu, 20 Jan 2011 18:21:37 +0000 (10:21 -0800)]
Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#
3146736" into honeycomb
Jeff Brown [Thu, 20 Jan 2011 03:56:18 +0000 (19:56 -0800)]
Merge "Prevent monkey from turning off the screen." into honeycomb
Jeff Brown [Thu, 20 Jan 2011 03:38:03 +0000 (19:38 -0800)]
Prevent monkey from turning off the screen.
Bug:
3371251
Change-Id: Iadae29e8e4a67052746b8e2d2f5f542e4ee6dcc5
Alexander Lucas [Thu, 20 Jan 2011 02:33:28 +0000 (18:33 -0800)]
Merge "Added Honeycomb Gallery sample application." into honeycomb
Alexander Lucas [Wed, 12 Jan 2011 01:24:40 +0000 (17:24 -0800)]
Added Honeycomb Gallery sample application.
Change-Id: I1eefc2837016a7973544f0c57a8464466e7dcef9
Trevor Johns [Wed, 19 Jan 2011 23:23:41 +0000 (15:23 -0800)]
Merge "NFC sample app" into honeycomb
Fabrice Di Meglio [Wed, 19 Jan 2011 22:30:52 +0000 (14:30 -0800)]
Merge "Update account tester" into honeycomb
Megha Joshi [Wed, 3 Nov 2010 06:27:24 +0000 (23:27 -0700)]
NFC sample app
Cherry-picking NFC sample into Honeycomb branch, since it wasn't
merged during it's original commit to Gingerbread.
Change-Id: I79308f04c1b2edd6cb5bb675fa13b9e5083a8432
Xavier Ducrohet [Wed, 19 Jan 2011 20:41:19 +0000 (12:41 -0800)]
Merge "HC preview & GB 2.3.1 use platform-tools rev 2." into honeycomb
Jaikumar Ganesh [Wed, 19 Jan 2011 18:40:43 +0000 (10:40 -0800)]
Merge "Modify Bluetooth Chat app for new insecure rfcomm API." into honeycomb
Jaikumar Ganesh [Fri, 14 Jan 2011 19:08:58 +0000 (11:08 -0800)]
Modify Bluetooth Chat app for new insecure rfcomm API.
Also fix some bugs.
Change-Id: I2e20a3b02fb904d64e03a2c4602a5b724912c742
Raphael [Wed, 19 Jan 2011 07:06:25 +0000 (23:06 -0800)]
HC preview & GB 2.3.1 use platform-tools rev 2.
Change-Id: Ib2dc3165f88b4c3bd3ba31a956ddb983ea496f2b
Xavier Ducrohet [Wed, 19 Jan 2011 02:13:34 +0000 (18:13 -0800)]
Merge "Add RenderScript samples to the SDK." into honeycomb
Alexander Lucas [Wed, 19 Jan 2011 02:04:38 +0000 (18:04 -0800)]
Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
Xavier Ducrohet [Wed, 19 Jan 2011 00:41:29 +0000 (16:41 -0800)]
Add RenderScript samples to the SDK.
Change-Id: I6139a792916a1cb942c05be8243d52784f39f859
Xavier Ducrohet [Tue, 18 Jan 2011 22:21:55 +0000 (14:21 -0800)]
Update sdk.prop for the platform SDK component.
sdk.properties should be stored in development.git and
not sdk.git so move it here.
Change-Id: I32e166927ea91cad36d66bb14e90cb36ccb3bc82
Fabrice Di Meglio [Tue, 18 Jan 2011 01:37:55 +0000 (17:37 -0800)]
Update account tester
- update Theme to use default one
- AccountManager.getAuthTokenByFeatures() can be called thru a button
- code refactoring and cleaning
Change-Id: I1b4cfb340d9ed1506541fb9faf349f50d05df472
Jack Palevich [Tue, 18 Jan 2011 10:42:31 +0000 (02:42 -0800)]
Merge "Add BasicGLSurfaceView sample." into honeycomb
Xavier Ducrohet [Tue, 18 Jan 2011 05:51:43 +0000 (21:51 -0800)]
Merge "Remove illegal @Override on interface method." into honeycomb
Xavier Ducrohet [Tue, 18 Jan 2011 05:51:39 +0000 (21:51 -0800)]
Merge "Update the API level of the Honeycomb samples." into honeycomb
Jack Palevich [Tue, 18 Jan 2011 01:48:44 +0000 (17:48 -0800)]
Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.
Change-Id: Iee83ca6a52eee64e8c6b77bc9a8abff11a1eabfd
Jack Palevich [Tue, 18 Jan 2011 01:39:43 +0000 (17:39 -0800)]
Merge "Add BasicGLSurfaceView sample." into gingerbread
Winson Chung [Tue, 18 Jan 2011 01:13:31 +0000 (17:13 -0800)]
Fixing typo.
Change-Id: I7e16ed4713d9bc2c2263e526e46c54a1f85b952c
Xavier Ducrohet [Tue, 18 Jan 2011 01:05:05 +0000 (17:05 -0800)]
Remove illegal @Override on interface method.
Samples should compile with 1.5
Change-Id: I029ae9ded4237fd9d4d2d1dbf2c7c537afbbf36b
Xavier Ducrohet [Tue, 18 Jan 2011 00:58:04 +0000 (16:58 -0800)]
Update the API level of the Honeycomb samples.
Change-Id: I5f14d45474957e9ee35a058d7b6295c860335429
Dianne Hackborn [Mon, 17 Jan 2011 20:31:08 +0000 (12:31 -0800)]
Follow API changes.
Change-Id: Ieb1df7fc0708f22aae3d851f74ade1343eb44e08
Andy Stadler [Mon, 17 Jan 2011 20:53:31 +0000 (12:53 -0800)]
Update demo for DPM encryption controls
* Follow revised API
* Show more status
Bug:
3346770
Change-Id: I6c5cd8d8f055ceb3a3a78cf3868dbc0f2d535acf
Xavier Ducrohet [Mon, 17 Jan 2011 03:38:59 +0000 (19:38 -0800)]
Merge "Move SDK component to API 10 + codename." into honeycomb
Xavier Ducrohet [Mon, 17 Jan 2011 03:38:51 +0000 (19:38 -0800)]
Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
Xavier Ducrohet [Mon, 17 Jan 2011 03:38:41 +0000 (19:38 -0800)]
Merge "Fix WXGA skin" into honeycomb
Xavier Ducrohet [Mon, 17 Jan 2011 03:16:16 +0000 (19:16 -0800)]
Merge "Add RS includes to the SDK and update skin list." into honeycomb
Winson Chung [Mon, 17 Jan 2011 01:12:47 +0000 (17:12 -0800)]
Adding WidgetPreview utility.
Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
Xavier Ducrohet [Sun, 16 Jan 2011 23:27:25 +0000 (15:27 -0800)]
Move SDK component to API 10 + codename.
Change-Id: If6c739a082c3c631de62d3c0db7615bcf29b4126
Xavier Ducrohet [Sun, 16 Jan 2011 23:23:40 +0000 (15:23 -0800)]
Move SDK component to 2.4 - DO NOT MERGE.
Change-Id: Ibee46cfa081d81a7cc12f9b81ec0a3637f5b487f
Dianne Hackborn [Sun, 16 Jan 2011 22:28:13 +0000 (14:28 -0800)]
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
Xavier Ducrohet [Fri, 14 Jan 2011 19:11:31 +0000 (11:11 -0800)]
Fix WXGA skin
Change-Id: Ia283c1f9774318661c7164fdb9da70c72bb26bdc
Xavier Ducrohet [Sun, 16 Jan 2011 21:21:52 +0000 (13:21 -0800)]
Add RS includes to the SDK and update skin list.
Change-Id: Id453585e5c1f4d80336bd2fc837afbc7a0a0d097
Jack Palevich [Sat, 15 Jan 2011 03:27:56 +0000 (19:27 -0800)]
Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.
Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
Yu Shan Emily Lau [Sat, 15 Jan 2011 03:25:11 +0000 (19:25 -0800)]
Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#
3146736
Change-Id: I82dc5d28a218f8e2a6e7c13f27a4aca398cd904d
Jaikumar Ganesh [Sat, 15 Jan 2011 00:11:35 +0000 (16:11 -0800)]
Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
Elliott Hughes [Fri, 14 Jan 2011 22:19:03 +0000 (14:19 -0800)]
Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
Jaikumar Ganesh [Fri, 14 Jan 2011 19:08:58 +0000 (11:08 -0800)]
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
Also fix some bugs.
Bug:
3352266
Change-Id: Ie64cb243159b1f6eea5f268f02a1dd58970d1e22
Christopher Tate [Fri, 14 Jan 2011 20:36:49 +0000 (12:36 -0800)]
Merge "Add a dynamically-revealed view to the drag demo" into honeycomb
Raphael [Fri, 14 Jan 2011 18:16:59 +0000 (10:16 -0800)]
Merge "Add llvm-rs-cc to the SDK (all platforms)" into honeycomb
Christopher Tate [Fri, 14 Jan 2011 04:27:12 +0000 (20:27 -0800)]
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
Jake Hamby [Fri, 14 Jan 2011 00:59:47 +0000 (16:59 -0800)]
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
Raphael [Fri, 14 Jan 2011 00:59:09 +0000 (16:59 -0800)]
Add llvm-rs-cc to the SDK (all platforms)
Change-Id: I6077251d0a34678e708ddd25068a511159ba7460
Jeff Hamilton [Wed, 12 Jan 2011 20:21:40 +0000 (14:21 -0600)]
Add a sample for the NFC foreground dispatch APIs.
Change-Id: Iee532d53b4d9354977414b0302b386a940606ab3
Andy Stadler [Wed, 12 Jan 2011 23:19:58 +0000 (15:19 -0800)]
Add encryption status controls
* Enable, disable, and activate encryption
* Report encryption status
Change-Id: Ia76cf6033fe00ebdfd3369f8123f5d1ec109f3a9
Scott Main [Thu, 13 Jan 2011 03:09:37 +0000 (19:09 -0800)]
Merge "docs: add section links to samples overview" into honeycomb
Dan Bornstein [Wed, 12 Jan 2011 18:35:32 +0000 (10:35 -0800)]
Happy new year!
Change-Id: I6daf044398620f2de3f186f77c0984c96eb8c501
Scott Main [Wed, 12 Jan 2011 05:09:53 +0000 (21:09 -0800)]
docs: add section links to samples overview
Change-Id: Ib605362eb97e607eba3d965a5ca0f32e6207b841
Elliott Hughes [Wed, 12 Jan 2011 02:00:58 +0000 (18:00 -0800)]
Minor doc fixes (mainly the infamous "repo init-u").
Bug: http://code.google.com/p/android/issues/detail?id=8769
Change-Id: I6924baf82cc6939ba51e0b01af1f5f3c56106a5d
Christopher Tate [Tue, 11 Jan 2011 04:45:20 +0000 (20:45 -0800)]
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
Chet Haase [Tue, 11 Jan 2011 15:20:55 +0000 (07:20 -0800)]
All animator resources moved to res/animator
Change-Id: I84ea32b1560041a30195067971f02cf9e780d853
Chet Haase [Tue, 11 Jan 2011 00:48:48 +0000 (16:48 -0800)]
Rename RGBEvaluator to ArgbEvaluator
Change-Id: I43cf6c9824b012424de1ef2a340ee9dde20af4a7
Scott Main [Mon, 10 Jan 2011 21:33:08 +0000 (13:33 -0800)]
Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread
Raphael [Mon, 10 Jan 2011 19:01:00 +0000 (11:01 -0800)]
Merge "SDK bump plat-tools." into honeycomb
Xavier Ducrohet [Mon, 10 Jan 2011 01:48:11 +0000 (17:48 -0800)]
Merge "Update source.properties for the Samples." into honeycomb
Xavier Ducrohet [Mon, 10 Jan 2011 01:34:21 +0000 (17:34 -0800)]
Update source.properties for the Samples.
Change-Id: Id250d5e1b8a9460314e0ebd9615048e5e4e3bd87
Brett Chabot [Mon, 10 Jan 2011 00:29:57 +0000 (16:29 -0800)]
Merge "Replace use of ro.monkey with ro.test_harness." into honeycomb
Brett Chabot [Sun, 9 Jan 2011 21:44:25 +0000 (13:44 -0800)]
Replace use of ro.monkey with ro.test_harness.
Bug
3329873
Change-Id: Ia681803c3d0b0afeceb178b8314c9d7227d99355
Dianne Hackborn [Sun, 9 Jan 2011 02:34:02 +0000 (18:34 -0800)]
Clean up from comments, enable throttling.
Change-Id: I719b0491a7953ab57d76634699c6fdf3ad8558e0
Dianne Hackborn [Sun, 9 Jan 2011 01:35:08 +0000 (17:35 -0800)]
Merge "Clean up to no longer use old APIs, add new loader throttle sample." into honeycomb
Dianne Hackborn [Sun, 9 Jan 2011 01:23:25 +0000 (17:23 -0800)]
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
Adam Powell [Sat, 8 Jan 2011 06:36:28 +0000 (22:36 -0800)]
Update dialog demos for API changes related to setting themed icons.
Change-Id: I73213f9593a381bd43b935aa2fa020ec3d6095d7
Xavier Ducrohet [Sat, 8 Jan 2011 01:13:07 +0000 (17:13 -0800)]
Merge "Update heapSize for WXGA skin." into honeycomb
Christopher Tate [Fri, 7 Jan 2011 21:35:41 +0000 (13:35 -0800)]
Rename drag "thumbnail" to the drag "shadow"
No functional changes; just a rename of the relevant class/method/parameters.
Change-Id: I506f8b541027cf104553c27547d3e9972cd1add8
Raphael [Fri, 7 Jan 2011 23:28:48 +0000 (15:28 -0800)]
Switch GB SDK to 2.4 / API 10. Do not merge.
Change-Id: I8e3c97c5c281b05e2e03b6739221ea8b13536bd3
Raphael [Fri, 7 Jan 2011 23:47:37 +0000 (15:47 -0800)]
SDK bump plat-tools.
Change-Id: I100ef5667d8c7f7e75748731464761021e61219e
Xavier Ducrohet [Fri, 7 Jan 2011 23:07:47 +0000 (15:07 -0800)]
Update heapSize for WXGA skin.
Change-Id: I8c0f376535d0e0969b02bd774b52a1bbbdeb7fc6
Xavier Ducrohet [Fri, 7 Jan 2011 22:33:36 +0000 (14:33 -0800)]
Add WXGA skin.
Change-Id: I29e62d5a1bf9d5017bfdca9fe07ae4e3124f951c
Xavier Ducrohet [Fri, 7 Jan 2011 21:48:18 +0000 (13:48 -0800)]
Merge "Cherry-pick
f0e5e933 from " into honeycomb
Xavier Ducrohet [Thu, 6 Jan 2011 21:31:24 +0000 (13:31 -0800)]
Cherry-pick
f0e5e933 from master.
Move emulator skins to development.git
Also added new default RAM config to the skins.
Change-Id: Ic22592573d6d153fb94e2e2c981068936cae1219
Xavier Ducrohet [Thu, 6 Jan 2011 21:31:24 +0000 (13:31 -0800)]
Cherry-pick
f0e5e933 from master.
Move emulator skins to development.git
Also added new default RAM config to the skins.
Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785
Gilles Debunne [Fri, 7 Jan 2011 20:13:12 +0000 (12:13 -0800)]
Merge "Made XmlAdapter sample a standalone application." into honeycomb
Derek Sollenberger [Fri, 7 Jan 2011 19:30:40 +0000 (11:30 -0800)]
Merge "Add basic test for retrieving the plugin's visible rect." into honeycomb
Derek Sollenberger [Fri, 7 Jan 2011 19:11:29 +0000 (14:11 -0500)]
Add basic test for retrieving the plugin's visible rect.
Change-Id: I32f80587438060ebaa0cbfb5f992fb4baadcdf67
Gilles Debunne [Fri, 7 Jan 2011 02:21:18 +0000 (18:21 -0800)]
Made XmlAdapter sample a standalone application.
Change-Id: If34f2086da65f81968f630a42e4b9e725cb65efe
Raphael [Fri, 7 Jan 2011 09:22:18 +0000 (01:22 -0800)]
Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread
Dianne Hackborn [Thu, 6 Jan 2011 20:51:17 +0000 (12:51 -0800)]
Codename now Honeycomb.
Change-Id: I32ac7dbd24bd3730deb608e20346fa9d40c3875a
Eric Fischer [Thu, 6 Jan 2011 18:27:56 +0000 (10:27 -0800)]
Import translations for additional languages.
Change-Id: I763f3be3ac076d68b6253b31963a9f476e2004a8
Jeff Brown [Thu, 6 Jan 2011 00:01:03 +0000 (16:01 -0800)]
Merge "Add libinput native tests."
Raphael Moll [Wed, 5 Jan 2011 23:50:28 +0000 (15:50 -0800)]
am
40812f1c: am
1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"
* commit '
40812f1c4b312d8276eb2839c06d2d76dd4f97e1':
Use OUT_DIR in atree to find android.jar