47260 Commits

Author SHA1 Message Date
Dianne Hackborn
700ab1c758 Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2 2011-05-16 11:02:29 -07:00
Dirk Dougherty
8b8bfc5d28 am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
  Doc change: typo fix
2011-05-16 11:01:44 -07:00
Scott Main
582c1361e8 am 5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
  docs: update featured videos and increase the max results for each playlist
2011-05-16 11:01:42 -07:00
Dirk Dougherty
babf844f46 Merge "Doc change: typo fix" into honeycomb-mr1 2011-05-16 10:59:00 -07:00
Scott Main
5eba0e98d1 docs: update featured videos and increase the max results for each playlist
Change-Id: I8d7a547960ed5bae4ea2eec9e8bac14c421d3746
2011-05-16 10:56:26 -07:00
Dirk Dougherty
58610ba382 Doc change: typo fix
Change-Id: I078cb313c02b37571b573f4fb4e68e11c45cc271
2011-05-16 10:41:34 -07:00
Scott Main
1ff0131e77 am fc0ea7ea: docs: add oem driver for alcatel
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
  docs: add oem driver for alcatel
2011-05-16 10:20:59 -07:00
Scott Main
fc0ea7ea5d docs: add oem driver for alcatel
Change-Id: I429583a3f2f4f91a6ffa21367b474f537ad28c96
2011-05-16 09:52:45 -07:00
Scott Main
084d3490a5 am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
  docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00
Scott Main
f73dcad35d Merge "docs: update homepage I/O announcement" into honeycomb-mr1 2011-05-13 20:26:56 -07:00
Dianne Hackborn
9a84983a9f DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem.  Also lots of general cleanup of the am
dump output.

Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
2011-05-13 18:38:19 -07:00
Dianne Hackborn
f9dd34f4d3 DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
And clean up some documentation.

Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
2011-05-13 18:31:04 -07:00
Xavier Ducrohet
738c5e6072 am 2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
  LayoutLib: implement data binding for most AdapterView
2011-05-13 16:30:44 -07:00
Dianne Hackborn
6121f06ed5 Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 2011-05-13 16:24:32 -07:00
Xavier Ducrohet
2fae858db5 LayoutLib: implement data binding for most AdapterView
Change-Id: I27be96ed2c37573eb22cfbb391d96b6137b3df8c
2011-05-13 15:55:49 -07:00
Dianne Hackborn
f3f2d731e1 Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 2011-05-13 15:33:21 -07:00
Gloria Wang
331de5dd58 DO NOT MERGE
For bug 4422428
Squashed commit of the following:

commit ae2e13783db2284f40d3891e70e152dab941edfc
Author: Gloria Wang <gwang@google.com>
Date:   Fri May 13 11:43:11 2011 -0700

    Add one more DRM error code. For bug 4422428.

    Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6

commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2
Author: Gloria Wang <gwang@google.com>
Date:   Fri Apr 29 10:44:46 2011 -0700

    Add DRM errors in the DRM frameworks to MediaErrors also.
    For bug 4350156.

    Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394

Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
2011-05-13 15:09:24 -07:00
Adam Powell
a593d9852f Fix a bug where an action bar could be created when it should not be.
Change-Id: I9ca1038accdb6d0a539750ed8ab068a41612f6ae
2011-05-13 14:09:54 -07:00
Jeff Brown
4fb76253f2 Fix bounds check.
Bug: 4413945

Also remove dead code from header file.

Change-Id: I4e9fc9d7f8612fedb436e62649d308bd737ed138
2011-05-13 12:51:12 -07:00
Dianne Hackborn
16f6e89c2a DO NOT MERGE. Integrate fragment work from master
Back-port new fragment detach APIs from support lib.

This allow a much cleaner implementation of things like the
fragment pager class.

Integrate from support lib: fix restore of list state.

The FragmentManager/ListFragment impl was restoring the list
state before setting its adapter.  This caused the list view to
lose the state, since it gets cleared as part of setting the
adapter.  Now the fragment manager waits on restoring the view
hierarchy state until after it has done onActivityCreated(),
at which point we have set the adapter.

It would be nice to make list view less fragile in this regard,
but that is for a different change.

Change-Id: I38606ef7d0b06478995f3fb7726aead67420e172
2011-05-13 12:42:22 -07:00
Scott Main
78987e0322 docs: update homepage I/O announcement
Change-Id: If61bfdf40c3b1d0c95b9a2694a849edf5e53bb54
2011-05-13 11:27:53 -07:00
Dianne Hackborn
0ed2e845db Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 2011-05-13 11:16:42 -07:00
Scott Main
78b875e7e6 am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 10:56:52 -07:00
Scott Main
d32aeafc41 am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:55:09 -07:00
Scott Main
edab852fe1 Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 2011-05-13 10:54:00 -07:00
Dianne Hackborn
ebff8f92f1 DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
2011-05-12 18:39:51 -07:00
Dianne Hackborn
a8138732a0 MR2 is going to be API 13.
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
2011-05-12 16:26:47 -07:00
Dianne Hackborn
df9799f0fc Fix build.
Change-Id: I97e357aa20c9ba91f20f77d53fc4dca1fd3aa598
2011-05-12 15:16:33 -07:00
Irfan Sheriff
01ea7f01ec Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2 2011-05-12 14:18:03 -07:00
Irfan Sheriff
09564fbb9f Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2 2011-05-12 14:17:51 -07:00
Teng-Hui Zhu
c1a005c356 Merge "Fix the Uri parsing issue" into honeycomb-mr2 2011-05-12 14:11:25 -07:00
Irfan Sheriff
fe3b33d4ea DO NOT MERGE Add DhcpStateMachine
Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
    to DHCP request/renewal being sent

Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98
2011-05-12 14:10:11 -07:00
Teng-Hui Zhu
64855da755 Fix the Uri parsing issue
Switching back to use the setDataSource with Uri, which can handle both the
file and http path correctly.

Change-Id: I5bfc1d01a8de0a4f8640ffceafbc17984833097a
2011-05-12 13:53:48 -07:00
Dianne Hackborn
0f1de9adde New compat mode front end: UI and persistence.
Adds a really crappy UI for toggling compat mode.

Persists compat mode selection across boots.

Turns on compat mode by default for newly installed apps.

Change-Id: Idc83494397bd17c41450bc9e9a05e4386c509399
2011-05-12 13:28:45 -07:00
Scott Main
432fbcc55f docs: enforce alphanumeric strings for video id to prevent XSS
bug 4399806

Change-Id: Ie55a2b40687bb68e734012cecf22de62b4f4cf7e
2011-05-11 20:14:42 -07:00
Robert Ly
f3cdea937b am a45e4f4d: doc change: adding link to pic board
* commit 'a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
  doc change: adding link to pic board
2011-05-11 09:04:52 -07:00
Robert Ly
a45e4f4df5 doc change: adding link to pic board
Change-Id: I1ac52d18285285f6e330265db15f103a473a26de
2011-05-10 22:57:31 -07:00
Andreas Huber
77d8dc2b95 Using widevine:// to stream adaptive bitrate wvm content no longer
uses stagefright's http cache but defers caching to the WVMExtractor, which
now has the responsibility of reporting buffer status/duration.

Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2
related-to-bug: 4390283
2011-05-10 15:49:47 -07:00
Eric Fischer
270fbfede5 am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '372592032a0e552ca30faadac9be823bd397910b':
  Import revised translations.  DO NOT MERGE
2011-05-10 14:21:08 -07:00
Eric Fischer
372592032a Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-05-10 14:18:10 -07:00
Eric Fischer
f3bd663c67 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-10 12:18:21 -07:00
Joe Onorato
81faa44c48 Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 2011-05-10 11:59:42 -07:00
Joe Onorato
5f9f7ff4b7 Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up
on large tablets.

Change-Id: I42d810a5b8e61b2959e30abef91477152495d39f
2011-05-10 11:58:22 -07:00
Dianne Hackborn
837bdc4919 Merge "Fix scaling of batched motion events." into honeycomb-mr2 2011-05-10 10:58:44 -07:00
Dirk Dougherty
0d5196b972 am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit '5f8f0a0d40675bc4d373121ffdd22730f3701662':
  Doc change: add Android 3.1 highlights and version notes.
2011-05-10 00:34:09 -07:00
Scott Main
fef7b62506 am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen supp
* commit '7f3cf449fe1b90b902a37ddc3c05ec7aa236e584':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
2011-05-10 00:34:06 -07:00
Dirk Dougherty
5f8f0a0d40 Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 2011-05-09 22:58:37 -07:00
Dirk Dougherty
b7c7f15737 Doc change: add Android 3.1 highlights and version notes.
Change-Id: Ifbc7df004d8aca9073d6397fad282a57ad4f1b74
2011-05-09 22:50:25 -07:00
Dianne Hackborn
e7d25b74b0 Fix scaling of batched motion events.
Change-Id: I1e070c936f7b2e8f1bb7ebae62b1df0aa6998b82
2011-05-09 21:19:26 -07:00
Scott Main
7f3cf449fe Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5" into honeycomb-mr1 2011-05-09 18:32:10 -07:00