Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp
* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.
I tested this by calling
ContactHeaderWidget.bindFromPhoneNumber(number1);
ContactHeaderWidget.bindFromPhoneNumber(number2);
where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.
- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.
Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'
* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp
* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp
* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
ScaleGestureDetector needs to query the displaymetrics
for the width/height on each touch down as orientation
can change.
This should fix the problem where we can't pinch on the
top right corner when device is in landscape mode.
Just scale the canvas instead of changing the real
scale factor during pinch.
Added over limit zoom feedback for pinch in the WebView.
Fix http://b/issue?id=2383539
This flag was already in the public API but did not do anything until now.
We now use it so we can override the default notification LED color on a per device basis.
Change-Id: I0d6e239b7da2fdbeda9608d6d4de3e778aa88e2c
BUG: 2329568
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp
* commit '89e3c1ab017717b619b27ca312d87918981004ca':
Fix the sloppy detection in the ScaleGestureDetector.
when the compiled-sql cache is full, print the warning only a few times and
after that, if the condition persists, clear the cache.
don't flood the cache with the same warning million times.
Make a slightly more informative usage message.
Give developers a slightly easier way to have their preloaded classes list out of sync without blowing up.
This flag can be set by a sync adapter if it is certain that the
name is correct (a social network sync adapter would be a good example
of this). It can also be explicitly set by the user in the Contact
Edit UI.
Bug: 2164422
Change-Id: Id46e04c28eeb0dc386adfc6ad8988dda50824e2b
Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp
* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
Edge of screen slop detection for ScaleGestureDetector.
