Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp
* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
Find layout classes in all "layout-*" dirs.
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp
* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
Try to switch to another default net on connection failure.
Merge commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp
* commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2':
Use MCC value to always override channel count setting
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
Merge commit 'e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp
* commit 'e834722f547d13eaa453464502456892c6225e42':
Fix failure to open AVRCP input device due to EPERM.
Sleep for 100us and try to open the input device again if it fails, with a
maximum of 10 attempts.
We need the retry logic because setting permissions on a new input device is
racy. The init process watches for new input device (via uevent) and sets the
permission on them in devices.c:make_device(). However at the same time
EventHub.cpp watches for new input devices from the system_server process, and
immediately tries to open them. I can't see a simple way to avoid this race
condition.
As best as I can tell this race condition has always exisited.
There must have been some timing change that happened recently that causes us
to hit this race condition much more often. See repro notes in referenced bug.
Bug: 2375632
This shouldn't be required, but there seems to be something odd going on
in wifi and it doesn't hurt to try other available options. Makes a
connection failure case work like a disconnected case.
bug: 2378462
FCC raised the issue of not allowing users to configure
channel counts beyond 11. This change enforces the channel
count based on MCC values.
Bug: 2378844
Merge commit '89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp
* commit '89e3c1ab017717b619b27ca312d87918981004ca':
Fix the sloppy detection in the ScaleGestureDetector.
Merge commit '2a79defa5a0481e4dd980938da13adc767e0b231' into eclair-plus-aosp
* commit '2a79defa5a0481e4dd980938da13adc767e0b231':
docs: add guide to copying and installing the Dev Tools app
Merge commit '48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp
* commit '48ef378d01b3ace349cbb6ba564276b854d872c9':
DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Merge commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp
* commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea':
Add bugreport info about network feature use. DO NOT MERGE
Backported from master change Ib9285359.
We've had a couple bug reports showing the effects of a left-live feature request.
We need a bit more bugreport-time logging.
bug: 2323226
bug: 2377507
change-id: I296b2887101c260aea678bf6db91144535cbad7e
Merge commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867' into eclair-plus-aosp
* commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867':
Be tolerant of GPS session and engine on status messages arriving out of order.
Merge commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp
* commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5':
docs: a lot of revision and expansion of the hello view tutorials
Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp
* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
Edge of screen slop detection for ScaleGestureDetector.