11968 Commits

Author SHA1 Message Date
The Android Open Source Project
176a88ff14 merge from open-source master 2010-01-21 11:21:25 -08:00
Ying Wang
6efe03b19e am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp

* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
  Find layout classes in all "layout-*" dirs.
2010-01-21 11:12:29 -08:00
Ying Wang
6f9e2c648c Merge "Find layout classes in all "layout-*" dirs." into eclair 2010-01-21 11:07:14 -08:00
Robert Greenwalt
1f2f23bd16 am 9fdf82e0: Merge "Try to switch to another default net on connection failure." into eclair
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp

* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
  Try to switch to another default net on connection failure.
2010-01-21 10:05:13 -08:00
Robert Greenwalt
9fdf82e080 Merge "Try to switch to another default net on connection failure." into eclair 2010-01-21 09:57:46 -08:00
Irfan Sheriff
d051434773 am dcc14d6a: Merge "Use MCC value to always override channel count setting" into eclair
Merge commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2' into eclair-plus-aosp

* commit 'dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2':
  Use MCC value to always override channel count setting
2010-01-21 07:52:52 -08:00
Irfan Sheriff
dcc14d6a26 Merge "Use MCC value to always override channel count setting" into eclair 2010-01-21 07:46:49 -08:00
Grace Kloba
e5b9beae26 am f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit 'f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp

* commit 'f6aed0e0a7c96094b66f5426baad78032b794497':
  DO NOT MERGE
2010-01-20 23:34:42 -08:00
Grace Kloba
f6aed0e0a7 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
5b74576218 am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-20 23:26:03 -08:00
Grace Kloba
d5ada83c71 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.
2010-01-20 23:06:43 -08:00
Ying Wang
c111296b97 Find layout classes in all "layout-*" dirs.
Before this CL, the generated keep flags for layout classes are incomplete,
such as layout classes in res/layout-port/ and res/layout-land and so on.
2010-01-20 22:12:46 -08:00
Grace Kloba
52cb3cbd6f DO NOT MERGE
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
2010-01-20 21:58:27 -08:00
Nick Pelly
425324e97b am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Merge commit 'e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp

* commit 'e834722f547d13eaa453464502456892c6225e42':
  Fix failure to open AVRCP input device due to EPERM.
2010-01-20 20:46:35 -08:00
Nick Pelly
e834722f54 Merge "Fix failure to open AVRCP input device due to EPERM." into eclair 2010-01-20 20:43:54 -08:00
Nick Pelly
e6b1bbd8ac 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
2010-01-20 19:56:24 -08:00
Robert Greenwalt
da03c4e4b3 Try to switch to another default net on connection failure.
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
2010-01-20 19:29:41 -08:00
Grace Kloba
aeeb1a84aa am 8681df90: DO NOT MERGE
Merge commit '8681df902e8cc61d290808c5d78ea48920d30f3b' into eclair-plus-aosp

* commit '8681df902e8cc61d290808c5d78ea48920d30f3b':
  DO NOT MERGE
2010-01-20 19:20:57 -08:00
Grace Kloba
8681df902e DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.

Fix http://b/issue?id=2385061
2010-01-20 19:15:44 -08:00
Mike Reed
6dc9232c1c am a66baccc: Merge "Do not merge" into eclair
Merge commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp

* commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
  Do not merge
2010-01-20 18:35:24 -08:00
Mike Reed
a66baccc8f Merge "Do not merge" into eclair 2010-01-20 18:32:32 -08:00
Xavier Ducrohet
48edf7c002 am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."
Merge commit 'd1da5fa2da9690be94929e391a4e66b9986573bc' into eclair-plus-aosp

* commit 'd1da5fa2da9690be94929e391a4e66b9986573bc':
  Revert "SDK doc change: Add doc update for NDKr3."
2010-01-20 17:54:12 -08:00
Xavier Ducrohet
d1da5fa2da Revert "SDK doc change: Add doc update for NDKr3."
This reverts commit 1dced50963312c5d340cbd129d0017d9cbb45f0b.
2010-01-20 17:45:18 -08:00
Irfan Sheriff
51e2f71f4a Use MCC value to always override channel count setting
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
2010-01-20 17:44:07 -08:00
Grace Kloba
f8c7d06ffa am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit '89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp

* commit '89e3c1ab017717b619b27ca312d87918981004ca':
  Fix the sloppy detection in the ScaleGestureDetector.
2010-01-20 17:40:30 -08:00
Grace Kloba
89e3c1ab01 Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair 2010-01-20 17:36:50 -08:00
Grace Kloba
8f9fbb0c45 Fix the sloppy detection in the ScaleGestureDetector.
Fix http://b/issue?id=2385061
2010-01-20 17:35:50 -08:00
Xavier Ducrohet
a0ecd4fbe6 am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair
Merge commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d' into eclair-plus-aosp

* commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d':
  SDK doc change: Add doc update for NDKr3.
2010-01-20 17:33:49 -08:00
Xavier Ducrohet
38f7a02a9b Merge "SDK doc change: Add doc update for NDKr3." into eclair 2010-01-20 17:30:27 -08:00
Scott Main
bfb8606831 am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Merge commit '2a79defa5a0481e4dd980938da13adc767e0b231' into eclair-plus-aosp

* commit '2a79defa5a0481e4dd980938da13adc767e0b231':
  docs: add guide to copying and installing the Dev Tools app
2010-01-20 17:15:09 -08:00
Scott Main
2a79defa5a Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 2010-01-20 17:10:25 -08:00
Scott Main
2c9d7fe21a docs: add guide to copying and installing the Dev Tools app
from the emulator to a device.
2010-01-20 16:58:46 -08:00
Irfan Sheriff
6b32c0a2ff am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
Merge commit '48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp

* commit '48ef378d01b3ace349cbb6ba564276b854d872c9':
  DO NOT MERGE Avoid wifi disable in a UNKNOWN state
2010-01-20 13:30:17 -08:00
Robert Greenwalt
8c48b4a532 am 1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Merge commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp

* commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea':
  Add bugreport info about network feature use. DO NOT MERGE
2010-01-20 13:30:11 -08:00
Mike Reed
12bcbdc681 Do not merge
port stretchy from master
2010-01-20 16:27:36 -05:00
Irfan Sheriff
48ef378d01 Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair 2010-01-20 13:26:08 -08:00
Robert Greenwalt
1a337547d5 Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair 2010-01-20 13:26:04 -08:00
Mike Reed
70660425c0 am 9f954cf2: Merge "Do not merge" into eclair
Merge commit '9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp

* commit '9f954cf27e9e2bb94c836b1686c0e07500234b27':
  Do not merge
2010-01-20 13:21:26 -08:00
Mike Reed
9f954cf27e Merge "Do not merge" into eclair 2010-01-20 13:17:49 -08:00
Robert Greenwalt
73912ce083 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
2010-01-20 12:36:09 -08:00
Robert Greenwalt
d2c21c1518 am 8c166512: Merge "Cleanup of process-specific DNS." into eclair
Merge commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b' into eclair-plus-aosp

* commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b':
  Cleanup of process-specific DNS.
2010-01-20 11:12:40 -08:00
Robert Greenwalt
8c166512a7 Merge "Cleanup of process-specific DNS." into eclair 2010-01-20 11:08:13 -08:00
Irfan Sheriff
0fe3f7cbbf DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Multiple broadcast receiver unregister calls cause exception.

Bug: 2361335
2010-01-20 10:08:23 -08:00
Mike Lockwood
47d302a001 am bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
Merge commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867' into eclair-plus-aosp

* commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867':
  Be tolerant of GPS session and engine on status messages arriving out of order.
2010-01-20 10:04:13 -08:00
Mike Lockwood
bb79e5fdb5 Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair 2010-01-20 10:00:55 -08:00
Xavier Ducrohet
3bd6dc6535 am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Merge commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp

* commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678':
  ADT/Layoutlib: implement sweep gradient.
2010-01-20 09:47:06 -08:00
Xavier Ducrohet
b44051eee0 Merge "ADT/Layoutlib: implement sweep gradient." into eclair 2010-01-20 09:43:46 -08:00
Mike Lockwood
cf1d8cb36f Be tolerant of GPS session and engine on status messages arriving out of order.
BUG: 2366194

Change-Id: I642dacd397202f671adba5a863394438ca62988d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-20 10:20:54 -05:00
Scott Main
382f924c95 am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file
Merge commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp

* commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5':
  docs: a lot of revision and expansion of the hello view tutorials
2010-01-19 19:59:24 -08:00
Adam Powell
97b108532f am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp

* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
  Edge of screen slop detection for ScaleGestureDetector.
2010-01-19 19:59:19 -08:00