46634 Commits

Author SHA1 Message Date
Shailendra Yadav
3fabad87f6 Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1 2011-03-14 17:23:05 -07:00
Gloria Wang
132bb659b6 Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1 2011-03-14 17:02:58 -07:00
Scott Main
9f3f36c95b am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
* commit 'c2366c898abacb4b6e3723f6cad522615a2b304e':
  docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
2011-03-14 16:42:28 -07:00
Scott Main
04e1af802a am 7b013bb5: docs: release notes for ADT 10.0.1
* commit '7b013bb579a9bc372b30e2e520f6e200f6c2b1b9':
  docs: release notes for ADT 10.0.1
2011-03-14 16:42:17 -07:00
Scott Main
c2366c898a Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb 2011-03-14 16:08:09 -07:00
Scott Main
ae7067f58d docs: update optimization guide with more info
most importantly, information about using <compatible-screens>
also add sample code to <compatible-screens> doc

Change-Id: I62f6ceee4e358a18f5e513cf54c9c96f27470ae9
2011-03-14 16:07:26 -07:00
Scott Main
7b013bb579 docs: release notes for ADT 10.0.1
Change-Id: If2a95c306e935c00944b0722b17b62315625ff93
2011-03-14 15:46:21 -07:00
Gloria Wang
27b277779c For issue 4082089
Add more info and error events into the DRM framework

Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
2011-03-14 15:29:08 -07:00
Nicolas Roard
65c282042d Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 2011-03-14 15:26:58 -07:00
Xavier Ducrohet
491ef0c6bd Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1 2011-03-14 15:24:20 -07:00
Nicolas Roard
3efaa34015 Adding placeholders for the large play button
used by the browser for HTML5 video (the button will appear
surimposed to the video)

bug:4080127
Change-Id: I681d2a4a3de1b2db64ffb3bbf4ce883320c771f1
2011-03-14 15:14:28 -07:00
Xavier Ducrohet
9d76581faf LayoutLib: Fix Arc rendering.
Looks like Java2D and Skia go in different directions for angles.

Change-Id: Ia0c9c70cd66c9a0941fa9921fecf8e4e83538af3
2011-03-14 15:12:21 -07:00
Nicolas Roard
0fd8fa33e2 Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 2011-03-14 15:11:55 -07:00
Shailendra Yadav
4d0ec22aa9 Fix for Don't allow adding 64-bit files(4086708)
Change-Id: I880c89b565dd8172fdf077a514d5b3d03eab7d9e
2011-03-14 15:07:05 -07:00
Jamie Gennis
071929b202 Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1 2011-03-14 14:49:37 -07:00
Huahui Wu
b71020ef40 Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 2011-03-14 14:43:46 -07:00
Scott Main
462012db70 am abdf0d53: docs: update search dev guide with SearcView widget
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
  docs: update search dev guide with SearcView widget
2011-03-14 14:36:56 -07:00
Eric Fischer
175121a513 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-14 14:17:01 -07:00
Eric Fischer
9f70f5268f Merge "Add "new incognito window" translations." into honeycomb-mr1 2011-03-14 14:13:29 -07:00
Eric Fischer
7b31d5c84f Import revised translations. DO NOT MERGE
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:06:03 -07:00
Nicolas Roard
5ee534cf88 Adding placeholders for the fullscreen button
used by the browser for HTML5 video

bug:4080127
Change-Id: I8fedef7eb0442de547ff083f15f6fcc7a9fea791
2011-03-14 13:59:04 -07:00
Scott Main
abdf0d533c docs: update search dev guide with SearcView widget
Change-Id: Ieb0ccdb78760a3c90df2381e647463f7532b0efc
2011-03-14 13:27:53 -07:00
Huahui Wu
2d3ef37ae6 b/3392594 keep the remain touch points when one is ended.
This is the Java side code change for b/3392594.
It adds an action index into the touch event data and pass it
to the native side.

Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
2011-03-14 13:21:23 -07:00
Irfan Sheriff
e21110f8b1 Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00
Jamie Gennis
6cd4656bf1 gl2_yuvtex: use the gralloc-provided stride.
This change fixes the gl2_yuvtex test to use the stride chosen by the
gralloc implementation rather than hard-coding it.

Bug: 4081948
Change-Id: If7c96a20fc3fb1df2ff25e6afaa9f34dbad2002c
2011-03-14 11:30:02 -07:00
Gilles Debunne
8503af8486 Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 2011-03-14 11:26:36 -07:00
Eric Laurent
3cbfd10bbb Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 2011-03-14 11:21:50 -07:00
Eric Fischer
5ce32d9fde Add "new incognito window" translations.
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.

Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
2011-03-14 11:17:02 -07:00
Mike Lockwood
3ec9d06f07 Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 2011-03-14 09:43:14 -07:00
Gloria Wang
7ea3c7f5a3 Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 2011-03-14 09:32:58 -07:00
Mike Lockwood
90f5d75cf0 MtpDevice: Handle zero length packets in readResponse()
Bug: 3509060

Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 10:33:22 -04:00
Mike Lockwood
e976ff4a22 Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 2011-03-14 04:02:50 -07:00
Mike Lockwood
dec0b755ff Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 2011-03-14 04:02:29 -07:00
Mike Lockwood
bce6f8f249 Add a dialog to ask user to start an application for a USB device or accessory
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity

Bug: 4074719

Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-13 19:18:08 -04:00
Eric Laurent
fa640154f1 Partial fix for issue 3515250: video chat and SCO
Do not call directly into AudioSystem in setBluetoothScoOn() but
send a message to the AudioService handler instead. As the
procedure to switch audio path to BT SCO can last some time we should
not block the caller which can run in the UI thread.

Change-Id: I6ac4b5a934d69781db3aebe5d0e8137b52a0ada4
2011-03-12 15:59:51 -08:00
Mike Lockwood
bcc0516bc8 MTP host: Fix problems reading large data packets
Fixes problem reading large thumbnails via PTP

Bug: 4065217

Change-Id: I643672512829c93ab0827091f39103dbb1918071
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-12 14:03:23 -05:00
Christopher Tate
767d7a0373 Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 2011-03-11 18:22:37 -08:00
Dianne Hackborn
9ff6483843 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00
Christopher Tate
38507bb993 Add a test app: quota exceeded doing a backup
This is a simple test app (a clone of the Backup/Restore sample code)
that deliberately backs up 20 megabytes of data every time it performs
a backup pass.  This is to trigger the quota-exceeded logic both on
the client and on the backend, for testing purposes.

Change-Id: I01f04d0f85c827baadf1990c09643d5eb5f88266
2011-03-11 17:58:01 -08:00
Mike Lockwood
9fffd9a8bb Merge "USB: minor cleanup work" into honeycomb-mr1 2011-03-11 17:52:36 -08:00
Adam Powell
87584f51a8 Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1 2011-03-11 16:39:42 -08:00
Glenn Kasten
7647091436 Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1 2011-03-11 16:31:55 -08:00
Mike Lockwood
62cfeeb821 USB: minor cleanup work
Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 18:51:29 -05:00
Gloria Wang
192b591cdc - Some change on the DrmManager in order to support feature request 4082089.
In DrmManager, we currently lock both processDrmInfo() and onInfo() which is
    ok for now since processDrmInfo() is async call, and it will return without
    waiting for onInfo() call. However, if we send an event in processDrmInfo(),
    we will got deadlock here because we need to invoke onInf() which will wait
    for processDrmInfo() to release the lock. Use different lock for onInfo().
- Remove some redundent mutex lock.

Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
2011-03-11 14:54:23 -08:00
Nicolas Roard
f0230cca19 Merge "HTML5 Video improvements" into honeycomb-mr1 2011-03-11 14:35:32 -08:00
Nicolas Roard
0e778a1ab0 HTML5 Video improvements
- add support for the fullscreen button

counterpart webkit CL: https://android-git.corp.google.com/g/#change,101484

bug:2126902
Change-Id: Ibcc8c5b115089ad1f30ebe76e4d5c31b2d6389f9
2011-03-11 14:29:05 -08:00
Dianne Hackborn
cf407ad88b Fix issues #4087362 and #4087356
4087362: Provide a safer way to call DialogFragment.dismiss()
4087356: PreferenceActivity.invalidateHeaders() can cause
IllegalStateException: Can not perform this action after onSaveInstanceState

These are very safe; the first is just a new public API that
allows you to use an existing feature in DialogFragment, and the
second just uses the version of commit that avoids the failure if
happening at a point where the operation would be lost if restored
from the last state (which is no big deal for preferences).

Change-Id: I53971c9fb1efdcd599694cdcd4585b81afc156b8
2011-03-11 13:48:32 -08:00
Mike Lockwood
14c875eac7 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 2011-03-11 13:24:01 -08:00
Mike Lockwood
c7d32d1065 Clear default for USB device/accessory when new matching app is installed
Bug: 4063041

Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 16:12:07 -05:00
Joe Malin
761b844091 am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
* commit '9f18729676a58cdfcee98db3329de3397c657d48':
  DOC CHANGE: Fix 4084450 monkeyrunner_concepts
2011-03-11 13:10:29 -08:00