45731 Commits

Author SHA1 Message Date
Romain Guy
a5364ee894 Add an API to control the distance between a View and its camera.
Change-Id: Ibaf4e7dc827933f7ad2bb7ab50c1dcef45fee83c
2011-02-24 16:49:47 -08:00
Jaikumar Ganesh
7d4da25c5c Merge "Refactor android.server.BluetoothService classes." 2011-02-24 16:34:37 -08:00
Jake Hamby
9a62c9cd65 Refactor android.server.BluetoothService classes.
Several cleanups to BluetoothService:
- Move BluetoothService.BondState inner class to top level.
- Extract adapter and remote device properties cache management
  logic into two new classes: BluetoothAdapterProperties and
  BluetoothDeviceProperties.
- Add getter methods for other classes in the package to access
  the new properties cache objects for multi-part operations.
- Inline log() method in BluetoothService and selected the
  appropriate Log method (Log.d, Log.w, Log.e) for each message.
- Refactor dump() method into smaller sized pieces.
- Clean up logic of updateCountersAndCheckForConnectionStateChange()
  method for better readability.
- Change sendConnectionStateChange() to return instead of sending
  an intent if the current or previous state values are invalid.
  Previously the code sent an intent with -1 for the invalid state.
- Added Javadoc comments to document the methods that are called from
  native Bluez code.
- Fixed some typos and code style issues.

Original Change by: Jake Hamby
Modified by: Jaikumar Ganesh

Change-Id: I76ebac00ecd29566dcb2d1ad3e7a486b7530ce24
2011-02-24 16:26:20 -08:00
Andreas Huber
0b52dbe315 Merge "Alternate patch for late video issue: seek only the video ahead to the next" 2011-02-24 16:26:14 -08:00
Santosh Madhava
92df99547f Merge "Fix for issue 3485010: The project thumbnail is not regenerated" 2011-02-24 16:25:53 -08:00
Mathias Agopian
ffbe826804 Merge "Fix some issues with RefBase debugging." 2011-02-24 16:23:51 -08:00
Santosh Madhava
89782f5013 Fix for issue 3485010: The project thumbnail is not regenerated
Change-Id: I2c882bdf2e82b95b1ad19ab50ec636a78b1c1561
2011-02-24 15:12:11 -08:00
Andreas Huber
a28f6f11f2 Merge "Suppress the logging of URLs when in incognito mode." 2011-02-24 14:49:10 -08:00
Andreas Huber
53182c439c Suppress the logging of URLs when in incognito mode.
Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a
related-to-bug: 3336575
2011-02-24 14:42:48 -08:00
Xavier Ducrohet
26c9612ffa Merge "LayoutLib: move tests to their own project." 2011-02-24 14:35:01 -08:00
Jamie Gennis
069d748da8 Merge "Expand on the SurfaceTexture API docs." 2011-02-24 14:24:04 -08:00
Mike Lockwood
b607b884bd Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts" 2011-02-24 14:05:02 -08:00
Eric Fischer
c950cf2269 Merge "Import revised translations." 2011-02-24 14:03:30 -08:00
Xavier Ducrohet
1911a6f781 LayoutLib: move tests to their own project.
Change-Id: I8a9e128e4a17ab57ec7b126a378035d9ce5bc168
2011-02-24 13:51:26 -08:00
Eric Hassold
447ee77431 Merge "Detect out of memory in extractAlpha" 2011-02-24 13:47:16 -08:00
Daniel Sandler
551df778f9 Merge "Remove commented cruft, TODOs, and dead code." 2011-02-24 13:36:52 -08:00
Andreas Huber
a2c29973e3 Alternate patch for late video issue: seek only the video ahead to the next
syncframe after the current audio media position, leave audio untouched.

Change-Id: Ia9fa8e205467e5460c8219afd396bddd09fcfb46
related-to-bug: 3375737
2011-02-24 13:32:38 -08:00
Christopher Tate
7e8a69ed5c Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens" 2011-02-24 13:22:19 -08:00
Christopher Tate
c2d55dd897 Binder linkage no longer depends on JNI objrefs as persistent tokens
There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:

1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se.  Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway.  Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.

2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object.  The implementation now asks Dalvik
whether object references match.

Bug 2090115

Change-Id: If62edd554d0a9fbb2d2977b0cbf8ad7cc8e2e68d
2011-02-24 13:15:09 -08:00
Glenn Kasten
373ed6fc79 Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink" 2011-02-24 12:37:02 -08:00
Cary Clark
808e8f6837 Merge "center long press to account for sloppy nodes" 2011-02-24 12:19:09 -08:00
Cary Clark
3ecd7db52a center long press to account for sloppy nodes
If a tap is close to, but not on a node, slop allows the tap
to find the node. Pass the slop-corrected values to
requestFocusNodeHref() as well.

bug:3412519
Change-Id: I7543354b6270976e1f99518581de23c567432b98
2011-02-24 14:58:23 -05:00
Eric Fischer
c5f2b9f907 Import revised translations.
Change-Id: Ib0c12e7b10809b2180a743bd2f9c186b04461920
2011-02-24 11:50:41 -08:00
Eric Fischer
261f33c12d am 86409c8c: (-s ours) am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '86409c8cb789cd7f672ee6de43e6bf1a337847db':
  Import revised translations.  DO NOT MERGE
2011-02-24 11:24:39 -08:00
Leon Scroggins
5bf4bb97e0 Merge "Stop the blinking caret when moving to another field." 2011-02-24 11:21:41 -08:00
Eric Hassold
ef7be262e5 Detect out of memory in extractAlpha
When extractAlpha() native method in Skia fails to allocate pixels,
it resets target bitmap. This change detects when such empty bitmap
is returned, and throws a OutOfMemory Java exception.

Depends on https://android-git.corp.google.com/g/97793

Bug: 3418381
Change-Id: I65a84998be089c49ed5005f6995bdc4f4d1669bc
2011-02-24 11:21:13 -08:00
Eric Fischer
86409c8cb7 am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '1c38872fd30d7b19a01cc309537e911e7f2344e9':
  Import revised translations.  DO NOT MERGE
2011-02-24 11:18:56 -08:00
Eric Fischer
1c38872fd3 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-24 11:15:53 -08:00
Patrick Dubroy
b5aeb9f4a5 Merge "Fix 3272590: Long-press on home & menu should be same as click" 2011-02-24 10:55:44 -08:00
Wink Saville
df3c4b45c8 am ee38808d: am 0dc8618d: Do not start RILReceiver if wifi-only.
* commit 'ee38808dcca92fa8677e7d03401f6bb7b54ec781':
  Do not start RILReceiver if wifi-only.
2011-02-24 10:52:53 -08:00
Wink Saville
ee38808dcc am 0dc8618d: Do not start RILReceiver if wifi-only.
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
2011-02-24 10:50:31 -08:00
Eric Fischer
f951bbf957 Import revised translations. DO NOT MERGE
Change-Id: I6a05c3031a451b0d288762f079203a412133dd14
2011-02-24 10:50:23 -08:00
repo sync
b5b85a9416 am 3905bc6c: (-s ours) am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
* commit '3905bc6ca3a2f29d2eb3fc9086ca0078f39c6829':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
2011-02-24 10:40:50 -08:00
Shimeng (Simon) Wang
ab85a63317 Merge "Pre-calculate view scale and text wrap scale for webkit." 2011-02-24 10:32:18 -08:00
Gilles Debunne
808b04abe6 Merge "Cursors correctly displayed with legacy theme." 2011-02-24 10:29:44 -08:00
Gilles Debunne
8f58dfad89 Merge "Text handles movement improvements." 2011-02-24 10:29:22 -08:00
Shimeng (Simon) Wang
76064644a7 Pre-calculate view scale and text wrap scale for webkit.
In viewport setup time, pre-calculate the more likely view scale
and text wrap scale instead of waiting until ZoomManager's FirstLayout
time.  This is to give webkit better and more correct information, such
as window width/height and inner width/height, when it is doing first layout.

issue: 3382398
Change-Id: I53fb15da43fbede6c03a4f51ec1c50e9a94f0236
2011-02-24 10:27:07 -08:00
repo sync
3905bc6ca3 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
2011-02-24 10:26:49 -08:00
Leon Scroggins
b611213ea1 Stop the blinking caret when moving to another field.
Bug:2930013

Requires a change in external/webkit.

Change-Id: Ie768efd02da0afe317c0f93e32148ceb5516a1ec
2011-02-24 13:24:00 -05:00
James Dong
d90ce9b411 Merge "Fix MP3Extractor" 2011-02-24 10:11:46 -08:00
James Dong
563ab6ec5e Fix MP3Extractor
When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.

o also fix some of the formatting string for logging

bug - 3482444

Change-Id: Ie0b56f4691ff9e80a48a57f1b7d0d28c78cfb313
2011-02-24 10:10:32 -08:00
Patrick Dubroy
ece945291e Fix 3272590: Long-press on home & menu should be same as click
Change-Id: I151571900f4bb63910ccfb77fc64c8be9676a224
2011-02-24 10:03:23 -08:00
Glenn Kasten
6152bbc650 Merge "Bug 3362814 Fix SMP race in access to mRequestExit" 2011-02-24 10:01:31 -08:00
repo sync
be2ed6d6e3 resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
2011-02-24 09:58:25 -08:00
Alon Albert
c96b669013 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Glenn Kasten
7b76c8d3fc Merge "Don't crash when parsing DRM MIME types" 2011-02-24 08:17:02 -08:00
Kristian Monsen
256d603d11 Merge "Hiding deprecated classes and methods" 2011-02-24 08:02:34 -08:00
Derek Sollenberger
62c7574c02 Merge "Skia Merge (revision 808)" 2011-02-24 05:27:34 -08:00
Wu-cheng Li
e857cc8175 Merge "Add YV12 preview format to camera parameter constants." 2011-02-24 02:51:17 -08:00
Wu-cheng Li
10a1b30dfb Add YV12 preview format to camera parameter constants.
bug:3463624
Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
2011-02-24 18:19:48 +08:00