20491 Commits

Author SHA1 Message Date
Adam Powell
2737dfe0a5 am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
* commit '5ec35c172ad0628b7092ab34f962ff2c063905d8':
  Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
2011-03-10 21:43:45 -08:00
Adam Powell
5ec35c172a Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1 2011-03-10 21:40:38 -08:00
Huahui Wu
372161b755 am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
* commit '769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
  b/4080388 Improving the performance of ZoomManager
2011-03-10 21:27:24 -08:00
Huahui Wu
769e132ae3 Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1 2011-03-10 21:25:47 -08:00
Adam Powell
8f626a1917 Fix bug 4082512 IAE "pointerIndex out of range" while zooming over
flashplayer in browser

Fix an issue where gestures weren't being fully canceled by webkit to
the multitouch detector. This will prevent ScaleGestureDetector from
attempting to resume its regularly scheduled gesture already in
progress.

Change-Id: Id4881eeb1df8414dfa23174481bd7dc70fd08fee
2011-03-10 21:20:07 -08:00
Ken Sumrall
9246e4edba am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
* commit 'c7fcc5076fb2988fba699a2167d19475fd58ed0b':
  Teach the framework to use the new android_reboot() function.
2011-03-10 19:27:05 -08:00
Ken Sumrall
c7fcc5076f Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 2011-03-10 19:24:42 -08:00
Huahui Wu
31484fbe28 b/4080388 Improving the performance of ZoomManager
This is a re-factor of cl b/3307761.
It uses an circular array to implement the queue instead of linked list.
And it saves the time to convert float to Float.

Change-Id: I1076aabec2310b2cc299d7f485bf9c4710107045
2011-03-10 17:48:38 -08:00
Teng-Hui Zhu
37ee248b52 am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
* commit '2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
  Inline HTML5 Video support
2011-03-10 17:13:03 -08:00
Teng-Hui Zhu
2fc7976399 Merge "Inline HTML5 Video support" into honeycomb-mr1 2011-03-10 17:10:29 -08:00
Adam Powell
6615362b14 am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
* commit 'cf63b66cfd49dda473806a3b001db72fca48af5a':
  Fix bug 4080407 - Browser stuck after scrolling- page stops responding
2011-03-10 17:07:52 -08:00
Adam Powell
cf63b66cfd Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1 2011-03-10 17:06:11 -08:00
Teng-Hui Zhu
661e8b1f21 Inline HTML5 Video support
Use the HTML5VideoView to make inline HTML5 video possible.
Full screen support will be the next step.

The native side change is at 101310.

bug:3506407, 2126902
Change-Id: I012f33a4d0c7b83d37b184fceb3923e1fb277b80
2011-03-10 16:58:24 -08:00
Adam Powell
80615b0075 Fix bug 4080407 - Browser stuck after scrolling- page stops responding
Account for gaps in touch queue sequence numbering when we flush out
canceled events from webcore's queue. Add a 2-second timeout to auto-flush
old events when a new gesture begins.

Change-Id: I764a7fcd673b3afb629055b001e9346f5b959dba
2011-03-10 16:45:12 -08:00
Xia Wang
05ab5caa80 am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
  Add WifiStressTest to Wi-Fi only test suite.
2011-03-10 15:57:27 -08:00
Xia Wang
4bc5c4a1f5 resolved conflicts for merge of 16cbe575 to honeycomb-mr1
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
2011-03-10 15:09:46 -08:00
Eric Fischer
adcaca260e am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'ff25b975052ddf0e74627cccca742cddd1c8e2f2':
  Import revised translations.  DO NOT MERGE
2011-03-10 14:47:57 -08:00
Eric Fischer
ff25b97505 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 14:46:18 -08:00
Eric Fischer
4942d9936a Import revised translations. DO NOT MERGE
Change-Id: I754a2637bbe533e80f5d863a52e2fbda7731638a
2011-03-10 14:25:11 -08:00
Justin Ho
9caea5efd9 am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
* commit 'fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
  New textfield search assets Bug: 3321263
2011-03-10 13:55:21 -08:00
Justin Ho
fa1d72c894 Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-10 13:53:48 -08:00
Eric Fischer
b23196d647 am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
  Import revised translations.  DO NOT MERGE
2011-03-10 13:46:28 -08:00
Eric Fischer
8d257f85ac Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:42:24 -08:00
Eric Fischer
c66ef5ab33 Import revised translations. DO NOT MERGE
Change-Id: I0ee1d6152852c0cb085cc073ed0684dcc03d6ba7
2011-03-10 11:23:57 -08:00
Shimeng (Simon) Wang
40f240166a am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1
* commit '0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
  Don't limit zoom scale change by the minimum increment.
2011-03-10 09:07:22 -08:00
Kristian Monsen
4543b8d4b0 am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
* commit '79b87df58861faeedd85804f6ea4f24eb67aef12':
  Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
2011-03-10 09:05:18 -08:00
Shimeng (Simon) Wang
0837fde9fd Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1 2011-03-10 09:04:12 -08:00
Kristian Monsen
79b87df588 Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1 2011-03-10 09:01:58 -08:00
Mike Lockwood
84edf14b62 am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit 'cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
  UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:52:30 -08:00
Mike Lockwood
cc08c439bc Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 2011-03-10 07:50:30 -08:00
Kristian Monsen
63a1b0cefe Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
Checking each app if they exist instead of iterating through
all packages.

Change-Id: Ic4934fa1e8dbbab2f90134e3701d39b1d4739d83
2011-03-10 11:30:43 +00:00
Mike Lockwood
ac36d7c715 UsbAccessory: Add URI string, replace type string with description
This is a first step toward adding USB accessory URI support

BUG: 4073248

Modified USB accessory matching logic to look only at manufacturer, model and version
(description and URI are not considered when matching apps to accessories)

Also added test for USB accessory protocol version to accessorytest

BUG: 4080288

Change-Id: I992a3433c74efa7a7db37bf030f02c1f0c92f9e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 22:12:49 -05:00
Jeff Brown
e6f0ae12b1 am efd3266b: Input improvements and bug fixes.
* commit 'efd3266b719eed5f1b217021c0a9e76e4b274b06':
  Input improvements and bug fixes.
2011-03-09 18:36:52 -08:00
Jeff Brown
efd3266b71 Input improvements and bug fixes.
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis.  This fixes new API that was introduced in MR1.
(Bug: 4066146)

Fixed a bug that might cause a segfault when using a trackball.

Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.

Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.

Improved the batching code to support batching events from different
sources of the same device in parallel.  (Bug: 3391564)

Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
2011-03-09 18:30:28 -08:00
Jeff Brown
e229621219 am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
* commit '06a0c9f5ee1f1c51607446f29ffb9697fa95e549':
  Make PointerLocationView also log generic motions and some keys.  (DO NOT MERGE)
2011-03-09 18:29:22 -08:00
Jeff Brown
18955491ee Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:25 -08:00
Jeff Brown
06a0c9f5ee Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:16 -08:00
Dianne Hackborn
f49c3ae2da am 7fd98159: Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
* commit '7fd981598ed0ec275d6da27c71e5e6c9db854e82':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class
2011-03-09 18:02:53 -08:00
Dianne Hackborn
7fd981598e Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1 2011-03-09 18:00:10 -08:00
Shimeng (Simon) Wang
3911b45005 Don't limit zoom scale change by the minimum increment.
issue: 4080125
Change-Id: I3fa258e12e7aa44c7286c9dccb1f249d5ae78a12
2011-03-09 17:55:35 -08:00
Ken Sumrall
0da47dae49 Teach the framework to use the new android_reboot() function.
The new android_reboot() function is a nicer way to reboot.
It can optionally sync(2) and remount as read-only writable
filesystems.  This fixes bug 3350709.

Change-Id: I792fa3f726f8d685a696f52cf760e731567ed8d4
2011-03-09 17:37:52 -08:00
Adam Powell
94929217ae am 0175e945: Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1
* commit '0175e945bb14b2208e00a3a7c9c35261981499a8':
  Fix external bug http://code.google.com/p/android/issues/detail?id=15183
2011-03-09 16:48:20 -08:00
Adam Powell
0175e945bb Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1 2011-03-09 16:45:57 -08:00
Adam Powell
7ee1ff1450 Fix external bug http://code.google.com/p/android/issues/detail?id=15183
Prevent overflow in FastScroller indexing

Change-Id: I53f90feaefd49717a0bdaddcf9a4988318d40c7d
2011-03-09 16:35:13 -08:00
Wei-Ta Chen
a204805627 am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
* commit '2498b4b8c6b02d553f46f9b48eee9d5295d36f16':
  Fix 3510563: memory leak in BitmapRegionDecoder.
2011-03-09 16:25:24 -08:00
Wei-Ta Chen
2498b4b8c6 Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1 2011-03-09 16:21:53 -08:00
Dianne Hackborn
de478eca19 am 7b5cb3c0: Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
* commit '7b5cb3c033f758368580664a8bdad43b47f3682d':
  Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl...
2011-03-09 15:50:34 -08:00
Dianne Hackborn
7b5cb3c033 Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1 2011-03-09 15:47:24 -08:00
Huahui Wu
a1555b8fa6 am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
* commit '37c2e3e55641e91dd0ec3dbd296bc6bc7c7641cf':
  b/4075349 Make the pinch to zoom more responsive after limits.
2011-03-09 15:39:56 -08:00
Huahui Wu
37c2e3e556 Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1 2011-03-09 15:37:56 -08:00