Dheeraj Sharma
38ab69a37e
am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb
...
* commit '2aaa776429f58069e25c8160a9e5b9a969f6e993':
VideoEditor:Fix for 3369908
2011-01-25 20:36:26 -08:00
Dheeraj Sharma
83af225202
Merge "VideoEditor:Fix for 3369908" into honeycomb
2011-01-25 20:34:15 -08:00
Adam Cohen
e5227471d5
am 0f16477b: Merge "Cleaning up StackView" into honeycomb
...
* commit '0f16477b2d2432a294801a12ac513cd41b00d03c':
Cleaning up StackView
2011-01-25 20:20:45 -08:00
Adam Cohen
72c36d455f
Merge "Cleaning up StackView" into honeycomb
2011-01-25 20:19:17 -08:00
Daniel Sandler
b1f7d374c1
am 34430260: Merge "Fit and finish on status bar:" into honeycomb
...
* commit '344302600a87175a9fd2bdfbf38708b1d1759731':
Fit and finish on status bar:
2011-01-25 18:58:50 -08:00
Daniel Sandler
f125cfb4e5
Merge "Fit and finish on status bar:" into honeycomb
2011-01-25 18:56:32 -08:00
Jaikumar Ganesh
b4d626248e
am 7f5d652b: Merge "Do Not Merge. Don\'t connect to non keyboard HID devices." into honeycomb
...
* commit '7f5d652b9c92950170f12f0e5a4641076ed75c20':
Do Not Merge. Don't connect to non keyboard HID devices.
2011-01-25 18:44:22 -08:00
Jaikumar Ganesh
369d3cf071
Merge "Do Not Merge. Don't connect to non keyboard HID devices." into honeycomb
2011-01-25 18:42:12 -08:00
Adam Powell
5d7c9a2b5a
am c5573a5a: Merge "Fix button assets and styles." into honeycomb
...
* commit 'c5573a5ac40d93b4b74608ee1858d04f74cb24f5':
Fix button assets and styles.
2011-01-25 18:32:00 -08:00
Adam Powell
afbb27d3dd
Merge "Fix button assets and styles." into honeycomb
2011-01-25 18:29:09 -08:00
Jeff Brown
ceb1a53981
am 1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
...
* commit '1b0cee368b35262a8de49c7a3c28e12195817533':
Disable mouse support. (DO NOT MERGE)
2011-01-25 18:20:40 -08:00
Jeff Brown
34cd206b74
am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb
...
* commit 'b1e0a870e4099490127bb917bb4fc7a8f48db893':
Fix crashes caused by some input devices.
2011-01-25 18:20:35 -08:00
Jeff Brown
a22b5608ca
Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
2011-01-25 18:18:10 -08:00
Jeff Brown
4d6f482ad5
Merge "Fix crashes caused by some input devices." into honeycomb
2011-01-25 18:18:05 -08:00
Mathias Agopian
972b486b56
am f6926a63: Merge "egl: clear error on function entry" into honeycomb
...
* commit 'f6926a63dfdc114789a6acc06396ca826eb64418':
egl: clear error on function entry
2011-01-25 18:02:49 -08:00
Mathias Agopian
7f7c6aa0b5
Merge "egl: clear error on function entry" into honeycomb
2011-01-25 18:01:03 -08:00
Arnaud Berry
e7abcb26b8
am 40f13039: Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
...
* commit '40f130398cdfc7bc123c6b8871d77d2398990d5e':
Fixed the display of the brightness controls in the system panel
2011-01-25 17:55:09 -08:00
Arnaud Berry
de9056f611
Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
2011-01-25 17:51:32 -08:00
Justin Ho
7a6910126d
am 77742fe2: Merge "Removing unused assets in mdpi" into honeycomb
...
* commit '77742fe284ebed28e53e155c07c5e50e74529dc9':
Removing unused assets in mdpi
2011-01-25 17:48:59 -08:00
Justin Ho
bbbd75cd77
Merge "Removing unused assets in mdpi" into honeycomb
2011-01-25 17:46:23 -08:00
Jim Miller
59e4311635
am 33f1d078: Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb
...
* commit '33f1d0780041d962f911b8908cb4929589f7e4fe':
Fix 3338368: Fix bounds calculation for recent apps view
2011-01-25 17:43:47 -08:00
Jim Miller
b199599517
Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb
2011-01-25 17:41:59 -08:00
Guang Zhu
76e67fc4d4
am 5794f230: change the way test app waits for gc
...
* commit '5794f2302209981c64425ea2b661b17f00b8f808':
change the way test app waits for gc
2011-01-25 17:39:21 -08:00
Adam Powell
602f680eae
am d63219f6: Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
...
* commit 'd63219f62248d067462403bed9e0539df53dd2dd':
Fix bug 3343940 - Legacy dialogs should use overlay action mode UI
2011-01-25 16:34:01 -08:00
Jeff Hamilton
65b5cb53cf
Merge "resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-25 16:29:48 -08:00
Jeff Hamilton
05233d5675
resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp
...
Change-Id: I6de7a12f0f491f02a6765d1f3fbd28ba3a62bea3
2011-01-25 18:29:11 -06:00
Adam Powell
0310534e1a
Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
2011-01-25 16:27:16 -08:00
Jim Miller
adf8008157
am adc14026: Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
...
* commit 'adc14026fbd21d5238a47f402c7b316a7aeac92e':
Fix 3381660: Make modifier keys in PasswordUnlock match IME
2011-01-25 16:24:23 -08:00
Brad Fitzpatrick
07c00287d8
am 6af61b84: am a206efcf: Merge "android.os.Message: respect sPoolSize"
...
* commit '6af61b843511bc5b669d30b980c4a9e2682da47c':
android.os.Message: respect sPoolSize
2011-01-25 16:21:29 -08:00
Jim Miller
e5951dcbe2
Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
2011-01-25 16:21:21 -08:00
Jeff Hamilton
f207453940
am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
...
* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
Fix the build, proper current.xml.
2011-01-25 16:15:58 -08:00
Costin Manolache
809c1325e8
am b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb
...
* commit 'b324911b473d20d10c0107273721791bc8b04568':
If 'customTokens', let authenticator handle notification.
2011-01-25 16:14:42 -08:00
Costin Manolache
b4a4dfc71c
Merge "If 'customTokens', let authenticator handle notification." into honeycomb
2011-01-25 16:13:12 -08:00
Jeff Hamilton
1b9429f227
Merge "Fix the build, proper current.xml." into gingerbread
2011-01-25 16:11:37 -08:00
Xavier Ducrohet
0613d09786
am cf2b9ca1: Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb
...
* commit 'cf2b9ca11ab493728fe75c1ffcd6bc2e273e1d55':
LayoutLib: return ViewInfo for all merged items + Build init.
2011-01-25 16:10:17 -08:00
Xavier Ducrohet
bbdc56d266
Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb
2011-01-25 16:08:03 -08:00
Mathias Agopian
71d9ee54e5
am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
...
* commit 'df8368925acd4593a309e06548d7f900bf8d94df':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-25 16:04:48 -08:00
Mathias Agopian
504097e622
am af4fa5d8: (-s ours) am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
...
* commit 'af4fa5d83d70a9af9ede67c47eae72d1db0d6d74':
partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-25 16:04:44 -08:00
Mathias Agopian
dd70836806
am 6b72702f: (-s ours) am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
...
* commit '6b72702f305cf3aad80ed6e9f962280be745b588':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-25 16:04:39 -08:00
Mathias Agopian
9c77314879
am 2d665dd3: (-s ours) am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
...
* commit '2d665dd37a6677a1e8f3f753e1656780286cfa29':
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-25 16:04:33 -08:00
Mathias Agopian
8c506af2af
am 88bccab3: (-s ours) am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
...
* commit '88bccab35c81907db09be3f511a2c1fd379a75b4':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-25 16:04:27 -08:00
Jeff Brown
eb8b9d8a22
Fix crashes caused by some input devices.
...
The touch screen sometimes reports more than 10 pointers even though that's
all we asked for. When this happens, we start dropping events with more
than 10 pointers. This confuses applications and causes them to crash.
Raised the limit to 16 pointers.
Bug: 3331247
The default behavior was to identify all touch devices as touch screens.
External devices that are plugged in are more likely to be touch pads
not attached to a screen. Changed the default to be a touch pad
and renamed some internal constants to avoid confusion.
A certain mouse happens to also behave like a touch pad. That caused
problems because we would see multiple concurrent traces of motion events
coming from the same input device so we would batch them up.
Added code to ensure that we don't batch events unless they come from
the same *source* in addition to coming from the same *device*.
Due to batching or misbehaving drivers, it's possible for the set of
pointer ids to be different from what we expect when it comes time to
split motion events across windows. As a result, we can generate motion
events with 0 pointers. When we try to deliver those events, we cause
an error in the InputTransport so we tear down the InputChannel and kill
the application.
Added code to check out assumption about pointer ids and drop the
event gracefully instead.
Patched up the tests to take into account the change in default behavior
for identifying touch screens and touch pads.
Change-Id: Ic364bd4cb4cc6335d4a1213a26d6bdadc7e33505
2011-01-25 16:02:22 -08:00
Jeff Hamilton
2dcaaf464b
Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-25 16:02:19 -08:00
Gilles Debunne
15534f4beb
am 4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb
...
* commit '4df103cf3d134bc0e428656e07c43eda2687ecdb':
A long press on the selection handle no longer selects the word.
2011-01-25 16:01:37 -08:00
Jeff Hamilton
2213bb43cc
resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp
...
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
2011-01-25 18:00:41 -06:00
Gilles Debunne
9b18927508
Merge "A long press on the selection handle no longer selects the word." into honeycomb
2011-01-25 15:59:01 -08:00
Romain Guy
e10c648baf
am 5c4c0d50: Merge "Fix documentation typo." into honeycomb
...
* commit '5c4c0d50fc1653fb6158e20d9b0af0325a80287c':
Fix documentation typo.
2011-01-25 15:50:18 -08:00
Romain Guy
92e9d3fc29
Merge "Fix documentation typo." into honeycomb
2011-01-25 15:48:17 -08:00
Mike Lockwood
0779af2290
am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
...
* commit 'f10d940413000732f1cd35bcb113c41019c7e3b7':
StagefrightMediaScanner: Close metadata retriever after we are done scanning
2011-01-25 15:48:06 -08:00
Mike Lockwood
40096245e5
Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
2011-01-25 15:46:25 -08:00