OSDN Git Service
Svetoslav Ganov [Fri, 25 Feb 2011 00:48:26 +0000 (16:48 -0800)]
Merge "The NumberPicker input cotrols are somtimes not shown."
Jamie Gennis [Fri, 25 Feb 2011 00:48:15 +0000 (16:48 -0800)]
Merge "Revert "Merge "Expand on the SurfaceTexture API docs."""
Romain Guy [Thu, 24 Feb 2011 22:46:04 +0000 (14:46 -0800)]
Add an API to control the distance between a View and its camera.
Change-Id: Ibaf4e7dc827933f7ad2bb7ab50c1dcef45fee83c
Jamie Gennis [Fri, 25 Feb 2011 00:45:21 +0000 (16:45 -0800)]
Revert "Merge "Expand on the SurfaceTexture API docs.""
This reverts commit
069d748da85559ffb2d09d181b186b1f71e350e7, reversing
changes made to
b607b884bd94d4f75fb4b2ead7457f2027ceb850.
Jaikumar Ganesh [Fri, 25 Feb 2011 00:34:37 +0000 (16:34 -0800)]
Merge "Refactor android.server.BluetoothService classes."
Jake Hamby [Thu, 9 Dec 2010 22:47:57 +0000 (14:47 -0800)]
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
Andreas Huber [Fri, 25 Feb 2011 00:26:14 +0000 (16:26 -0800)]
Merge "Alternate patch for late video issue: seek only the video ahead to the next"
Santosh Madhava [Fri, 25 Feb 2011 00:25:53 +0000 (16:25 -0800)]
Merge "Fix for issue
3485010: The project thumbnail is not regenerated"
Mathias Agopian [Fri, 25 Feb 2011 00:23:51 +0000 (16:23 -0800)]
Merge "Fix some issues with RefBase debugging."
Santosh Madhava [Thu, 24 Feb 2011 23:12:11 +0000 (15:12 -0800)]
Fix for issue
3485010: The project thumbnail is not regenerated
Change-Id: I2c882bdf2e82b95b1ad19ab50ec636a78b1c1561
Svetoslav Ganov [Thu, 24 Feb 2011 23:08:39 +0000 (15:08 -0800)]
The NumberPicker input cotrols are somtimes not shown.
bug:
3452868
1. Now hiding the input controls, which also cancels the input controls
fade-in animation, on every intercept of down since the fade-in
anumation flips a flag used to guide the drawing of the input controls.
Note that we also want the scroll wheel shown on down but the fade-in
anumation is actually hiding it upon completion.
Change-Id: Ib161ed757e537365b21e6913370d264152dca1fe
Andreas Huber [Thu, 24 Feb 2011 22:49:10 +0000 (14:49 -0800)]
Merge "Suppress the logging of URLs when in incognito mode."
Andreas Huber [Thu, 24 Feb 2011 22:42:48 +0000 (14:42 -0800)]
Suppress the logging of URLs when in incognito mode.
Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a
related-to-bug:
3336575
Xavier Ducrohet [Thu, 24 Feb 2011 22:35:01 +0000 (14:35 -0800)]
Merge "LayoutLib: move tests to their own project."
Jamie Gennis [Thu, 24 Feb 2011 22:24:04 +0000 (14:24 -0800)]
Merge "Expand on the SurfaceTexture API docs."
Mike Lockwood [Thu, 24 Feb 2011 22:05:02 +0000 (14:05 -0800)]
Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts"
Eric Fischer [Thu, 24 Feb 2011 22:03:30 +0000 (14:03 -0800)]
Merge "Import revised translations."
Xavier Ducrohet [Thu, 24 Feb 2011 21:51:26 +0000 (13:51 -0800)]
LayoutLib: move tests to their own project.
Change-Id: I8a9e128e4a17ab57ec7b126a378035d9ce5bc168
Eric Hassold [Thu, 24 Feb 2011 21:47:16 +0000 (13:47 -0800)]
Merge "Detect out of memory in extractAlpha"
Daniel Sandler [Thu, 24 Feb 2011 21:36:52 +0000 (13:36 -0800)]
Merge "Remove commented cruft, TODOs, and dead code."
Andreas Huber [Thu, 24 Feb 2011 20:05:40 +0000 (12:05 -0800)]
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
Christopher Tate [Thu, 24 Feb 2011 21:22:19 +0000 (13:22 -0800)]
Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"
Christopher Tate [Thu, 17 Feb 2011 21:00:38 +0000 (13:00 -0800)]
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
Glenn Kasten [Thu, 24 Feb 2011 20:37:02 +0000 (12:37 -0800)]
Merge "Bug
3438258 Add SurfaceTexture as MediaPlayer sink"
Cary Clark [Thu, 24 Feb 2011 20:19:09 +0000 (12:19 -0800)]
Merge "center long press to account for sloppy nodes"
Cary Clark [Thu, 24 Feb 2011 19:58:23 +0000 (14:58 -0500)]
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
Eric Fischer [Thu, 24 Feb 2011 19:50:41 +0000 (11:50 -0800)]
Import revised translations.
Change-Id: Ib0c12e7b10809b2180a743bd2f9c186b04461920
Eric Fischer [Thu, 24 Feb 2011 19:24:39 +0000 (11:24 -0800)]
am
86409c8c: (-s ours) am
1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
86409c8cb789cd7f672ee6de43e6bf1a337847db':
Import revised translations. DO NOT MERGE
Leon Scroggins [Thu, 24 Feb 2011 19:21:41 +0000 (11:21 -0800)]
Merge "Stop the blinking caret when moving to another field."
Eric Hassold [Thu, 24 Feb 2011 00:46:11 +0000 (16:46 -0800)]
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
Eric Fischer [Thu, 24 Feb 2011 19:18:56 +0000 (11:18 -0800)]
am
1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
1c38872fd30d7b19a01cc309537e911e7f2344e9':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 19:15:53 +0000 (11:15 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Patrick Dubroy [Thu, 24 Feb 2011 18:55:44 +0000 (10:55 -0800)]
Merge "Fix
3272590: Long-press on home & menu should be same as click"
Wink Saville [Thu, 24 Feb 2011 18:52:53 +0000 (10:52 -0800)]
am
ee38808d: am
0dc8618d: Do not start RILReceiver if wifi-only.
* commit '
ee38808dcca92fa8677e7d03401f6bb7b54ec781':
Do not start RILReceiver if wifi-only.
Wink Saville [Thu, 24 Feb 2011 18:50:31 +0000 (10:50 -0800)]
am
0dc8618d: Do not start RILReceiver if wifi-only.
* commit '
0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
Do not start RILReceiver if wifi-only.
Eric Fischer [Thu, 24 Feb 2011 18:50:23 +0000 (10:50 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I6a05c3031a451b0d288762f079203a412133dd14
repo sync [Thu, 24 Feb 2011 18:40:50 +0000 (10:40 -0800)]
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.
Shimeng (Simon) Wang [Thu, 24 Feb 2011 18:32:18 +0000 (10:32 -0800)]
Merge "Pre-calculate view scale and text wrap scale for webkit."
Gilles Debunne [Thu, 24 Feb 2011 18:29:44 +0000 (10:29 -0800)]
Merge "Cursors correctly displayed with legacy theme."
Gilles Debunne [Thu, 24 Feb 2011 18:29:22 +0000 (10:29 -0800)]
Merge "Text handles movement improvements."
Shimeng (Simon) Wang [Tue, 22 Feb 2011 23:31:02 +0000 (15:31 -0800)]
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
repo sync [Thu, 24 Feb 2011 18:26:49 +0000 (10:26 -0800)]
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.
Leon Scroggins [Thu, 24 Feb 2011 17:35:50 +0000 (12:35 -0500)]
Stop the blinking caret when moving to another field.
Bug:
2930013
Requires a change in external/webkit.
Change-Id: Ie768efd02da0afe317c0f93e32148ceb5516a1ec
James Dong [Thu, 24 Feb 2011 18:11:46 +0000 (10:11 -0800)]
Merge "Fix MP3Extractor"
James Dong [Thu, 24 Feb 2011 17:16:43 +0000 (09:16 -0800)]
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
Patrick Dubroy [Thu, 24 Feb 2011 02:35:01 +0000 (18:35 -0800)]
Fix
3272590: Long-press on home & menu should be same as click
Change-Id: I151571900f4bb63910ccfb77fc64c8be9676a224
Glenn Kasten [Thu, 24 Feb 2011 18:01:31 +0000 (10:01 -0800)]
Merge "Bug
3362814 Fix SMP race in access to mRequestExit"
repo sync [Thu, 24 Feb 2011 17:58:25 +0000 (09:58 -0800)]
resolved conflicts for merge of
c96b6690 to gingerbread-plus-aosp
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
Alon Albert [Thu, 24 Feb 2011 17:20:46 +0000 (09:20 -0800)]
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 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
Glenn Kasten [Thu, 24 Feb 2011 16:17:02 +0000 (08:17 -0800)]
Merge "Don't crash when parsing DRM MIME types"
Kristian Monsen [Thu, 24 Feb 2011 16:02:34 +0000 (08:02 -0800)]
Merge "Hiding deprecated classes and methods"
Derek Sollenberger [Thu, 24 Feb 2011 13:27:34 +0000 (05:27 -0800)]
Merge "Skia Merge (revision 808)"
Wu-cheng Li [Thu, 24 Feb 2011 10:51:17 +0000 (02:51 -0800)]
Merge "Add YV12 preview format to camera parameter constants."
Wu-cheng Li [Tue, 22 Feb 2011 07:49:25 +0000 (15:49 +0800)]
Add YV12 preview format to camera parameter constants.
bug:
3463624
Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
Mathias Agopian [Thu, 17 Feb 2011 04:23:43 +0000 (20:23 -0800)]
Fix some issues with RefBase debugging.
First slipt sp<> out of RefBase into StrongPointer.h so it can be reused
more easily and to make it clear that it doesn't require RefBase.
Note: the rest of the change only affects the system when DEBUG_REFS is enabled.
The main problem we fix here is that the owner id associated with each
reference could get out of date when a sp<> or wp<> was moved, for
instance when they're used in a Vector< >.
We fix this issue by calling into RefBase::moveReferences from
a template specialization for sp<TYPE> and wp<TYPE> of the
type helpers. RefBase::moveReferences() has then a chance to
update the owner ids.
There is a little bit of trickery to implement this generically in
RefBase, where we need to use a templatized functor that can turn
a sp<TYPE>* casted to a void* into a RefBase*.
Introduced a new debug option DEBUG_REFS_FATAL_SANITY_CHECKS
currently set to 0 by default as there seem to be an issue
with sp<ANativeWindow> which trips the sanity checks.
Change-Id: I4825b21c8ec47d4a0ef35d760760ae0c9cdfbd7f
Romain Guy [Thu, 24 Feb 2011 03:46:33 +0000 (19:46 -0800)]
Add a new Camera API to control the camera's location
Change-Id: Id9a082d2def803eb527e1987875e0d8a22c6e8aa
Xavier Ducrohet [Thu, 24 Feb 2011 02:32:15 +0000 (18:32 -0800)]
Merge "LayoutLib: Add debug mode."
Xavier Ducrohet [Thu, 24 Feb 2011 02:32:10 +0000 (18:32 -0800)]
Merge "LayoutLib: downsize the SparseArray when possible."
Xavier Ducrohet [Thu, 24 Feb 2011 00:51:08 +0000 (16:51 -0800)]
LayoutLib: Add debug mode.
Change-Id: If4263c7dba63a063f84e0c6988c270eb6d291ac3
Wink Saville [Thu, 24 Feb 2011 01:28:05 +0000 (17:28 -0800)]
Do not start RILReceiver if wifi-only.
By not starting RILReceiver we don't waste any cycles
trying to communicate with a vendor ril which may
not exist. This allows a wifi-only device to operate
as expected and the system to gracefully handle the
missing radio as ril requests will report RADIO_NOT_AVAILABLE.
Change-Id: I6c6f60830486c5f0447b3b9eb44c8b1f2d70c517
Jason Chen [Thu, 24 Feb 2011 02:11:21 +0000 (18:11 -0800)]
am
36b0b85a: (-s ours) am
22577b8d: (-s ours) am
5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '
36b0b85abd20b4f4bea210060dec3fbe80870dd5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Jason Chen [Thu, 24 Feb 2011 02:08:23 +0000 (18:08 -0800)]
am
22577b8d: (-s ours) am
5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '
22577b8d3a39c1373594ba3e4427212eee4cd6d4':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Gilles Debunne [Thu, 24 Feb 2011 01:48:28 +0000 (17:48 -0800)]
Cursors correctly displayed with legacy theme.
Bug
3482848
Change-Id: Ic2eda961a8bb5e865bc638106124d00a5a7b4b21
Irfan Sheriff [Thu, 24 Feb 2011 02:06:02 +0000 (18:06 -0800)]
am
6588c7cf: (-s ours) am
5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '
6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df':
DO NOT MERGE Add support for background scanning
Jason Chen [Thu, 24 Feb 2011 02:03:34 +0000 (18:03 -0800)]
am
5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '
5ff79c3b06d7087153617dc973491fc890700af5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Irfan Sheriff [Thu, 24 Feb 2011 02:02:45 +0000 (18:02 -0800)]
am
5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '
5107eea64e46b0fffbbbcefa469a88044f309de6':
DO NOT MERGE Add support for background scanning
Glenn Kasten [Tue, 1 Feb 2011 19:32:29 +0000 (11:32 -0800)]
Bug
3362814 Fix SMP race in access to mRequestExit
Also fix an unlikely SMP race in access to mHoldSelf on entry to _threadLoop.
Change-Id: I6cbc0b94739c7dd5e77e8a5ba0da22cdc0b1a4db
Michael Kolb [Thu, 24 Feb 2011 01:44:43 +0000 (17:44 -0800)]
Merge "make @hide actually hide"
Michael Kolb [Thu, 24 Feb 2011 01:43:16 +0000 (17:43 -0800)]
make @hide actually hide
Change-Id: I84f09acd551d0dc81081322fbeda883d271f8256
Gilles Debunne [Thu, 24 Feb 2011 01:25:13 +0000 (17:25 -0800)]
Text handles movement improvements.
Bug
3329346
Making sure the cursor is never hidden by the finger. Some
vertical movement is not repercuted on the handles' position
if it moves the finger closer to its 'ideal' touch position,
where both the insertion line and the top of the handle are
visible.
Also removed the hysteresis line filter which is not that
usefull and feels sluggy.
Change-Id: I6ad0fed0cf66753c6571b3bc620b1a0f2397c7b2
Jason Chen [Thu, 24 Feb 2011 01:23:53 +0000 (17:23 -0800)]
Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
Dianne Hackborn [Thu, 6 Jan 2011 02:27:40 +0000 (18:27 -0800)]
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Original change description follows:
-----------------------------------
Implement issue #
3326435: Battery stats improvements
Keep track of discharge while screen is on vs. off.
Checkin looks like:
5,0,u,dc,1,1,1,0
The last four numbers are, from left:
- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.
Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
James Dong [Thu, 24 Feb 2011 01:07:49 +0000 (17:07 -0800)]
d263 may contain optional bitr box, and thus its size can be up to 23 bytes
bug -
3482703
Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
Michael Kolb [Thu, 24 Feb 2011 00:12:13 +0000 (16:12 -0800)]
use getTitleHeight for measuring
Bug:
3473996
change getTitleHeight to be protected so that subclass
can override it
use getTitleHeight for rendering
use getHeight for clipping
Change-Id: I6e9a85d88eba176886e53b260d02082d26b410d8
Irfan Sheriff [Thu, 24 Feb 2011 00:59:55 +0000 (16:59 -0800)]
Merge "DO NOT MERGE Add support for background scanning" into honeycomb
Chet Haase [Thu, 24 Feb 2011 00:59:03 +0000 (16:59 -0800)]
Merge "Fix bug with bad state in animators"
Irfan Sheriff [Thu, 24 Feb 2011 00:54:55 +0000 (16:54 -0800)]
Merge "Remove backup of sleep policy setting"
Chet Haase [Thu, 24 Feb 2011 00:53:18 +0000 (16:53 -0800)]
Fix bug with bad state in animators
Bug
3482310: The playing state was not being correctly set to
RUNNING after an animator was start()'d. Instead, we were seeking
to the start value (correct), setting the state to SEEKED (also correct),
but not resetting the playing state to STOPPED. So when the animation
actually started animating values, it didn't recognize that it was
starting a STOPPED animation, so it never set its state to RUNNING,
and never returned true from isRunning().
Change-Id: Iea92dce98f92f60052d8a9a451094b953f9f0c67
John Reck [Thu, 24 Feb 2011 00:50:24 +0000 (16:50 -0800)]
Merge "Add x- header to prevent url logging in incognito"
John Reck [Thu, 24 Feb 2011 00:42:10 +0000 (16:42 -0800)]
Add x- header to prevent url logging in incognito
Bug:
3336575
Change-Id: I4a65242405d731f74c676382a810f608afcaad39
Mike Lockwood [Thu, 24 Feb 2011 00:40:12 +0000 (16:40 -0800)]
Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"
Mike Lockwood [Wed, 23 Feb 2011 16:21:00 +0000 (08:21 -0800)]
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
Romain Guy [Thu, 24 Feb 2011 00:32:16 +0000 (16:32 -0800)]
Merge "More documentation for Canvas.drawArc()"
Romain Guy [Thu, 24 Feb 2011 00:30:36 +0000 (16:30 -0800)]
More documentation for Canvas.drawArc()
Change-Id: I007a1db94306e05cf4e245f876aa1921f518c113
Jason Sams [Thu, 24 Feb 2011 00:29:41 +0000 (16:29 -0800)]
Merge "fix bug
3477451 Bogus asserts with pure compute scripts."
Kenny Root [Thu, 24 Feb 2011 00:27:10 +0000 (16:27 -0800)]
Merge "Fix measurement of external media dir"
Kenny Root [Thu, 24 Feb 2011 00:25:25 +0000 (16:25 -0800)]
Fix measurement of external media dir
Change-Id: I90a39c6a506ad0e5d18b40824d06eb1a7e376a3e
Dmitri Plotnikov [Wed, 23 Feb 2011 23:49:58 +0000 (15:49 -0800)]
Fix javadoc for DisplayNameSources
Bug:
3370212
Change-Id: I13d3ae96b6fcbba6d1ae8a1f06fb971de1f73f81
Romain Guy [Thu, 24 Feb 2011 00:05:07 +0000 (16:05 -0800)]
A bit more doc for ListAdapter#areAllItemsEnabled().
Change-Id: I339de99f52a8b5a3405d2aabd83a6dc92ca96e98
Romain Guy [Thu, 24 Feb 2011 00:04:07 +0000 (16:04 -0800)]
Merge "A bit more doc for ListAdapter#areAllItemsEnabled()."
Scott Main [Thu, 24 Feb 2011 00:02:13 +0000 (16:02 -0800)]
am
b1eea45a: am
201959af: Merge "docs: fix sensorevent code snippets bug:
3480932" into honeycomb
* commit '
b1eea45a71a3fffe3014bbe84226df3c57ddbafc':
docs: fix sensorevent code snippets bug:
3480932
Scott Main [Thu, 24 Feb 2011 00:00:08 +0000 (16:00 -0800)]
am
201959af: Merge "docs: fix sensorevent code snippets bug:
3480932" into honeycomb
* commit '
201959af6e61c148576c77de6cf772456d664251':
docs: fix sensorevent code snippets bug:
3480932
Scott Main [Wed, 23 Feb 2011 23:58:13 +0000 (15:58 -0800)]
Merge "docs: fix sensorevent code snippets bug:
3480932" into honeycomb
Romain Guy [Wed, 23 Feb 2011 23:57:19 +0000 (15:57 -0800)]
Merge "Add dither XML attribute support to Gradient and ShapeDrawable."
Romain Guy [Wed, 23 Feb 2011 23:57:08 +0000 (15:57 -0800)]
Add dither XML attribute support to Gradient and ShapeDrawable.
Change-Id: I4b60a0ba6766b7e7b176e78dc7f15f8467e2b890
Jaikumar Ganesh [Wed, 23 Feb 2011 23:50:57 +0000 (15:50 -0800)]
Merge "Make BluetoothPan inherit from BluetoothProfile."
Jaikumar Ganesh [Wed, 23 Feb 2011 18:22:15 +0000 (10:22 -0800)]
Make BluetoothPan inherit from BluetoothProfile.
Change-Id: Ibd3e24e391be93ebe2cf975bd075efb68e10c1ff
Eric Fischer [Wed, 23 Feb 2011 23:38:38 +0000 (15:38 -0800)]
am
bb0c1a36: (-s ours) am
32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
bb0c1a366dab54f20c8aded19ca01fe3d8721de2':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 23 Feb 2011 23:36:08 +0000 (15:36 -0800)]
am
32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
32751e3175d8dca96d75b6c93a32557c259c13a7':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 23 Feb 2011 23:33:12 +0000 (15:33 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb