45746 Commits

Author SHA1 Message Date
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
Mathias Agopian
ec122eb46b 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
2011-02-23 22:21:41 -08:00
Romain Guy
47b8adec39 Add a new Camera API to control the camera's location
Change-Id: Id9a082d2def803eb527e1987875e0d8a22c6e8aa
2011-02-23 19:51:42 -08:00
Xavier Ducrohet
81904fa40b Merge "LayoutLib: Add debug mode." 2011-02-23 18:32:15 -08:00
Xavier Ducrohet
8ee31a0a93 Merge "LayoutLib: downsize the SparseArray when possible." 2011-02-23 18:32:10 -08:00
Xavier Ducrohet
f0a53435f1 LayoutLib: Add debug mode.
Change-Id: If4263c7dba63a063f84e0c6988c270eb6d291ac3
2011-02-23 18:12:49 -08:00
Wink Saville
0dc8618dc7 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
2011-02-23 18:11:45 -08:00
Jason Chen
e4ce73763d 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
2011-02-23 18:11:21 -08:00
Jason Chen
36b0b85abd 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
2011-02-23 18:08:23 -08:00
Gilles Debunne
eca97a320f Cursors correctly displayed with legacy theme.
Bug 3482848

Change-Id: Ic2eda961a8bb5e865bc638106124d00a5a7b4b21
2011-02-23 18:06:48 -08:00
Irfan Sheriff
56ae666995 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
2011-02-23 18:06:02 -08:00
Jason Chen
22577b8d3a 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
2011-02-23 18:03:34 -08:00
Irfan Sheriff
6588c7cf73 am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
  DO NOT MERGE Add support for background scanning
2011-02-23 18:02:45 -08:00
Glenn Kasten
c2b3cda097 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
2011-02-23 17:49:59 -08:00
Michael Kolb
b384fac01d Merge "make @hide actually hide" 2011-02-23 17:44:43 -08:00
Michael Kolb
601e779ae7 make @hide actually hide
Change-Id: I84f09acd551d0dc81081322fbeda883d271f8256
2011-02-23 17:43:16 -08:00
Gilles Debunne
ddf00b8afe 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
2011-02-23 17:25:13 -08:00
Jason Chen
5ff79c3b06 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Dianne Hackborn
9248e95a2f 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
2011-02-23 17:21:09 -08:00
James Dong
bc5f1f5c81 d263 may contain optional bitr box, and thus its size can be up to 23 bytes
bug - 3482703

Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
2011-02-23 17:11:41 -08:00
Michael Kolb
75a03f9a3c 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
2011-02-23 17:01:38 -08:00
Irfan Sheriff
5107eea64e Merge "DO NOT MERGE Add support for background scanning" into honeycomb 2011-02-23 16:59:55 -08:00
Chet Haase
a8bdc2a42e Merge "Fix bug with bad state in animators" 2011-02-23 16:59:03 -08:00
Irfan Sheriff
1e231cbf0c Merge "Remove backup of sleep policy setting" 2011-02-23 16:54:55 -08:00
Chet Haase
154f14508a 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
2011-02-23 16:53:18 -08:00
John Reck
a6adf983d9 Merge "Add x- header to prevent url logging in incognito" 2011-02-23 16:50:24 -08:00
John Reck
ab5901dab2 Add x- header to prevent url logging in incognito
Bug: 3336575

Change-Id: I4a65242405d731f74c676382a810f608afcaad39
2011-02-23 16:42:10 -08:00
Mike Lockwood
55d03444ba Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence" 2011-02-23 16:40:12 -08:00
Mike Lockwood
58ec34cef5 GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-23 16:35:33 -08:00
Romain Guy
bcbe8b699e Merge "More documentation for Canvas.drawArc()" 2011-02-23 16:32:16 -08:00
Romain Guy
4a317db43d More documentation for Canvas.drawArc()
Change-Id: I007a1db94306e05cf4e245f876aa1921f518c113
2011-02-23 16:34:21 -08:00
Jason Sams
595f37c103 Merge "fix bug 3477451 Bogus asserts with pure compute scripts." 2011-02-23 16:29:41 -08:00
Kenny Root
5be2b95db6 Merge "Fix measurement of external media dir" 2011-02-23 16:27:10 -08:00
Kenny Root
c7624d9338 Fix measurement of external media dir
Change-Id: I90a39c6a506ad0e5d18b40824d06eb1a7e376a3e
2011-02-23 16:25:25 -08:00
Dmitri Plotnikov
dbcdbf2128 Fix javadoc for DisplayNameSources
Bug: 3370212
Change-Id: I13d3ae96b6fcbba6d1ae8a1f06fb971de1f73f81
2011-02-23 16:05:58 -08:00
Romain Guy
68b6b1c2d1 A bit more doc for ListAdapter#areAllItemsEnabled().
Change-Id: I339de99f52a8b5a3405d2aabd83a6dc92ca96e98
2011-02-23 16:05:07 -08:00