Commit Graph

51365 Commits

Author SHA1 Message Date
Russell Brenner
1711e463a4 am dd36e1bd: (-s ours) am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
* commit 'dd36e1bde1e05cc9ece468693ea286536efad180':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 21:27:41 -07:00
Mike Lockwood
af4932a2be Merge "Environment: Fix default mount point for external storage" 2011-05-25 20:36:05 -07:00
Dianne Hackborn
b2771f1a41 Merge "resolved conflicts for merge of 77dd616e to master" 2011-05-25 20:35:04 -07:00
Mike Lockwood
d4bdc7b4da Environment: Fix default mount point for external storage
/mnt/sdcard is the real mount point.  /sdcard is just a symlink.

Change-Id: If584e5cd31238d5b263de5bd72e179d53875d8c3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-25 23:33:50 -04:00
Gloria Wang
98472cced0 Merge "For out of band timed text support (timed text in a separate file)." 2011-05-25 20:11:25 -07:00
satok
f9f0100862 Add Apis to send notifications when the suggestion was picked
- Due to a strong request from VoiceIME

Bug: 4443922

Change-Id: Ia539de0acf66053e0349daec459d75e36805f6bf
2011-05-26 11:02:31 +09:00
Gloria Wang
13bc8cde1c For out of band timed text support (timed text in a separate file).
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
2011-05-25 17:53:29 -07:00
Romain Guy
f30c23d7bf Merge "Rename test to be able to launch it on crespo." 2011-05-25 17:49:50 -07:00
Romain Guy
f9be16a9d4 Rename test to be able to launch it on crespo.
Change-Id: Ieb3e1f6a2e3effe5c4042ad170f195244c7e2158
2011-05-25 17:49:11 -07:00
Dianne Hackborn
fee1c69a49 resolved conflicts for merge of 77dd616e to master
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Eric Laurent
6662576d8f Merge "Issue 4364098: bluetooth SCO not working" 2011-05-25 16:22:36 -07:00
Eric Laurent
b06ac839dd Issue 4364098: bluetooth SCO not working
AudioService does not need to unconditionally stop virtual calls
when the audio mode is changed from normal. Only stop virtual calls
that have been started from AudioService.

Change-Id: I75992d3655661e5910536a62dc8a8e0256d835e8
2011-05-25 16:03:01 -07:00
Jamie Gennis
4175a9085e Merge changes I09a74538,I08d96b38,Ic1d3344b
* changes:
  SurfaceTexture: disable a failing test.
  SurfaceTexture: fix an error check in dequeueBuffer.
  SurfaceTexture: clean up some comments, tests, etc.
2011-05-25 15:54:35 -07:00
James Dong
1b9b34adf7 Merge "Convert line breaks to Unix style" 2011-05-25 12:37:07 -07:00
Jamie Gennis
dd386ccb90 SurfaceTexture: disable a failing test.
The SurfaceTextureSyncModeWaitRetire test was disabled.  It is failing
because of the synchronization hacks that were added to SurfaceTexture
to work around bugs in vendor device drivers.

Change-Id: I09a74538bfe14a04833acb6847471e00826cc7fc
2011-05-25 12:27:33 -07:00
Jamie Gennis
44e9e0d825 SurfaceTexture: fix an error check in dequeueBuffer.
This change fixes the MIN_UNDEQUEUED_BUFFERS error check in
dequeueBuffer.  The check should only be performed if a buffer has been
queued since the last time the buffer count was changed by the client.
The check must be applied conditionally because video decoders require
all the bufferes to be dequeued and registered before beginning the
decode.

Change-Id: I08d96b380544e395c2fcf0f3983a199bfd695b09
2011-05-25 12:27:33 -07:00
Jamie Gennis
a218715a7f SurfaceTexture: clean up some comments, tests, etc.
This change fixes up some stale comments, member variable names, log
messages and disables a failing test.

Change-Id: Ic1d3344b18066cf710e4a42838b2417c6b1f2f6c
2011-05-25 12:27:33 -07:00
Kristian Monsen
4ece6db47e Merge "Merge chromium to 10.0.634.0: Compile fix" 2011-05-25 12:09:56 -07:00
Kristian Monsen
1fae3cf246 Merge "Merge Chromium at 10.0.634.0: Add autofill fax string" 2011-05-25 12:09:46 -07:00
Adam Powell
50f7fb9ca1 Merge "Action bar tab layout" 2011-05-25 12:01:00 -07:00
Adam Powell
f8ac6b7394 Action bar tab layout
Sync with UX on action bar tab layout behavior.

Make action bar tabs behave better with configuration changes.

LinearLayout now supports largest child measurement in unspecified
mode.

Change-Id: Id520641715a61c07e64124a0c5a70912996c98a0
2011-05-25 11:55:56 -07:00
Romain Guy
4725a90e8e Code cleanup.
Change-Id: Ie7685b14e3eb81a2e1034004c3ba04b523e9dd13
2011-05-25 11:13:20 -07:00
Romain Guy
7d70fbf0b5 Use OpenGL to render transition bitmaps.
When the IME is opened/dismissed, ViewAncestor would draw the
view hierarchy into a Bitmap, using the software rendering
pipeline. With this change, ViewAncestor will now use OpenGL.

Change-Id: I69e24570e12ff55f6f3cec18a664b33410a0eaf4
2011-05-25 11:13:19 -07:00
Russell Brenner
0d74112eed Merge "merge from honeycomb mr2" 2011-05-25 11:04:28 -07:00
Kristian Monsen
a014db7f0b Merge Chromium at 10.0.634.0: Add autofill fax string
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710

Change-Id: I20130029e26f2d9ef6ea4828921b070c887ccb69
2011-05-25 18:54:31 +01:00
Brian Carlstrom
4c74c03fd1 Merge "Remove need for onActivityResult from KeyChain API" 2011-05-25 10:30:36 -07:00
Brian Carlstrom
ba1a667b1d Remove need for onActivityResult from KeyChain API
Change-Id: I97bb9db06978f6dc039d22bfee116671d7b3e336
2011-05-25 10:27:46 -07:00
Russell Brenner
70ecf97804 merge from honeycomb mr2
Refire the redraw event if webkit wasn't ready

If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: I70fcf652cc854f995885c58b55d58ecf75734ab8
2011-05-25 10:23:26 -07:00
Eric Laurent
feeba076c6 Merge "Bluetooth SCO audio API improvements." 2011-05-25 10:13:49 -07:00
Russell Brenner
dd36e1bde1 am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
* commit '8b98284b97b81a4cc85d9fc26e79160e9c38ff1c':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 09:14:50 -07:00
Eric Laurent
dc03c61fe3 Bluetooth SCO audio API improvements.
The AudioManager API to control bluetooth SCO did not provide an easy way for
applications to handle SCO connection errors. When a request to activate SCO with
AudioManager.startBluetoothSco() failed, no state change was indicated via
AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED intent. The application had to
implement a timeout to handle connection failures.

The API change consists in defining a new intent AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED
and deprecate AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED. The new intent
will broacast a new state CONNECTING when the SCO connection is initiated.
The application can monitor changes from CONNECTING to either CONNECTED or DISCONNECTED
states to detect connection success or failure.
An extra indicating the previous state is also added to the new intent.

Also improved BluetoothHeadset service management in AudioService. A disconnection
from the service is not considered as a device or SCO link disconnection. Instead, if the
service interface is not present when a request to activate SCO is received, an
attempt is made to reconnect to the service.

Change-Id: I005fda1caaf74bb7de64fece44e9c7e628e828db
2011-05-25 09:11:46 -07:00
Russell Brenner
8b98284b97 am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
* commit '64796477f61f2fb5435e5043820c67dead4ec577':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 09:05:55 -07:00
Russell Brenner
64796477f6 Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2 2011-05-25 09:00:26 -07:00
Narayan Kamath
f509e72c71 Merge "Add a separate thread for writing to audiotracks." 2011-05-25 08:26:38 -07:00
Steve Block
ceb82f71dd Merge "Merge WebKit at r78450: Update useragent string" 2011-05-25 08:15:34 -07:00
Steve Block
ae8eb6beba Merge WebKit at r78450: Update useragent string
Change-Id: I4d597a8709e9188c083e73a133a12d3121204e6f
2011-05-25 16:10:29 +01:00
Narayan Kamath
c90f1c815d Add a separate thread for writing to audiotracks.
Now, SynthesisRequest.audioAvailable( ) will not block
until all data has been written to the audiotrack.

Change-Id: Ie24c0b6873ae44659e88646fb7ef821750dc314e
2011-05-25 15:31:06 +01:00
Kristian Monsen
31d2cd2474 Merge chromium to 10.0.634.0: Compile fix
base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/6028009

Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
2011-05-25 11:50:00 +01:00
Kristian Monsen
f8355d5489 am bc533dd3: (-s ours) am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit 'bc533dd3201afdcf421070cc47250dd7471b77aa':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
2011-05-24 19:54:15 -07:00
John Reck
2221e34ba5 am 00bcea1a: am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
* commit '00bcea1ac3be490e2730d15a6406541341dd3853':
  Update the Desktop UA to Chrome
2011-05-24 19:54:11 -07:00
Wink Saville
c9e3608fa6 am 5faaaa5f: am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE
* commit '5faaaa5f5af3ef1b82178bc36933bede5ad0c5d7':
  Handle ProvideLocalInfo stk command.
2011-05-24 19:53:59 -07:00
Irfan Sheriff
d57f5067e6 am c2ff0e70: am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE
* commit 'c2ff0e7031b54810d26e1d2a1ba9cdb529f25306':
  Clear network id when invalid
2011-05-24 19:53:04 -07:00
Dianne Hackborn
77dd616e68 am 00b3a5c6: am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
* commit '00b3a5c65e6ef26056178d1d7473b921671752e9':
  More compatibility mode improvements.
2011-05-24 19:13:45 -07:00
Dianne Hackborn
00b3a5c65e am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
* commit 'c404e9b20165f634904d1489216d17d8e09fe696':
  More compatibility mode improvements.
2011-05-24 19:10:53 -07:00
Dianne Hackborn
c404e9b201 Merge "More compatibility mode improvements." into honeycomb-mr2 2011-05-24 19:07:55 -07:00
Dianne Hackborn
5be8de3420 More compatibility mode improvements.
We now correctly adjust display metrics, fixing for example issues
seen in Barcode Scanner.  In addition the decision about when to use
compatibility mode has a bug fixed where certain apps would not go
out of compatibility mode even though they should be able to.

Change-Id: I5971206323df0f11ce653d1c790c700f457f0582
2011-05-24 18:13:25 -07:00
Russell Brenner
1d87cbf602 DO NOT MERGE-Refire the redraw event if webkit wasn't ready
If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: Ib0c4cedb10f58821f95c439824c30043a906f8b8
2011-05-24 17:17:40 -07:00
Ying Wang
8f40e58712 Merge "Fix intermediate src dir for framework.jar" 2011-05-24 16:27:17 -07:00
Chet Haase
dfe1645c22 Merge "Add more functionality to ViewPropertyAnimator." 2011-05-24 16:07:02 -07:00
Andreas Huber
70fbd15af9 Merge "Make sure all references to the decoder plugin are accounted for" 2011-05-24 15:58:09 -07:00