Xavier Ducrohet
49a6653f00
am 0f83b571: Merge "LayoutLib: Fix moveChild animation." into honeycomb
...
* commit '0f83b571e294a443a992cdf71bc5e6aaf7464d39':
LayoutLib: Fix moveChild animation.
2011-01-10 10:55:17 -08:00
Xavier Ducrohet
5c6b786e1c
Merge "LayoutLib: display warning when a resource reference fails to resolve." into honeycomb
2011-01-10 10:54:18 -08:00
Xavier Ducrohet
0f83b571e2
Merge "LayoutLib: Fix moveChild animation." into honeycomb
2011-01-10 10:53:37 -08:00
Andreas Huber
7caa130a98
NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.
...
Change-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d
related-to-bug: 3336496
2011-01-10 10:38:31 -08:00
Gilles Debunne
8aa9966467
Merge "Do not display the IME when selection in non editable text."
2011-01-10 10:37:29 -08:00
Gilles Debunne
dcb70c7f54
Do not display the IME when selection in non editable text.
...
Change-Id: Ifce5aaa2de88eb6c428a82d12a8bbad4a350ae38
2011-01-10 10:36:02 -08:00
Gilles Debunne
33a9f9bd3a
am 91736984: am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
...
* commit '917369844f83604e528bee49ba042a2d1fe32509':
Fix for an NPE in Account settings on long press.
2011-01-10 10:18:22 -08:00
Gilles Debunne
917369844f
am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
...
* commit '58f750ad145e6920c1c75bed8b333e54d78f3fed':
Fix for an NPE in Account settings on long press.
2011-01-10 10:15:48 -08:00
James Dong
2fef324c38
am faa75436: am be0ae5ea: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
...
* commit 'faa75436ef7ae82304df81b3ffc78a7803f4bb12':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object
2011-01-10 10:15:16 -08:00
James Dong
faa75436ef
am be0ae5ea: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
...
* commit 'be0ae5ea135539f044f660b4a4d5105e14574804':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object
2011-01-10 10:13:40 -08:00
Gilles Debunne
58f750ad14
Merge "Fix for an NPE in Account settings on long press." into honeycomb
2011-01-10 10:12:59 -08:00
James Dong
be0ae5ea13
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
2011-01-10 10:11:18 -08:00
Adam Cohen
5a173cb251
am 1613b5ba: am 4c894519: Merge "Fixing bug where StackView doesn\'t clip it\'s children correctly" into honeycomb
...
* commit '1613b5ba7bfe7cb89276b3bdbff8a492b892045f':
Fixing bug where StackView doesn't clip it's children correctly
2011-01-10 10:11:11 -08:00
Adam Cohen
1613b5ba7b
am 4c894519: Merge "Fixing bug where StackView doesn\'t clip it\'s children correctly" into honeycomb
...
* commit '4c8945191c60a92123c3df15a1f0a737a7084449':
Fixing bug where StackView doesn't clip it's children correctly
2011-01-10 10:08:19 -08:00
Adam Cohen
4c8945191c
Merge "Fixing bug where StackView doesn't clip it's children correctly" into honeycomb
2011-01-10 10:06:19 -08:00
Adam Cohen
488672148c
Fixing bug where StackView doesn't clip it's children correctly
...
Change-Id: Icb051fa355c5c1b92f81d56f04efd4f8699c65a4
2011-01-10 10:04:01 -08:00
Gilles Debunne
b0db5940c9
Fix for an NPE in Account settings on long press.
...
Bug 3333512
Change-Id: Ief79e824b86b964598f00ef74c6b5c61c0730242
2011-01-10 10:00:37 -08:00
Cary Clark
e10364089f
am 0c62f82b: am b74e32cc: Merge "add more alt key acceleration in webview" into honeycomb
...
* commit '0c62f82bbbbe0ffe198ce845a20c03804c8f1d15':
add more alt key acceleration in webview
2011-01-10 09:58:40 -08:00
Cary Clark
0c62f82bbb
am b74e32cc: Merge "add more alt key acceleration in webview" into honeycomb
...
* commit 'b74e32cc7ded9b26c1ba1e1bcff98fc9e7128562':
add more alt key acceleration in webview
2011-01-10 09:57:02 -08:00
Cary Clark
b74e32cc7d
Merge "add more alt key acceleration in webview" into honeycomb
2011-01-10 09:55:54 -08:00
John Reck
a9f910a055
am 17147ee3: am 36fd7a39: Tweak user agent building to avoid multiple spaces
...
* commit '17147ee3274f5e9a7de33de71a4e7cea4759c95f':
Tweak user agent building to avoid multiple spaces
2011-01-10 09:53:33 -08:00
John Reck
17147ee327
am 36fd7a39: Tweak user agent building to avoid multiple spaces
...
* commit '36fd7a39caafac26ea3d56ffc924bce0a53092f1':
Tweak user agent building to avoid multiple spaces
2011-01-10 09:50:53 -08:00
John Reck
36fd7a39ca
Tweak user agent building to avoid multiple spaces
...
Bug: 3211038
The building of the user agent could previously have multiple sequential
spaces. This was causing the CTS test to fail.
Change-Id: I13fc76ba6b97ee84dd44461b4d03b6ca70b48cdf
2011-01-10 09:48:13 -08:00
Mike Lockwood
48296a4672
am 16c1c55f: am 5e63e251: Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb
...
* commit '16c1c55f07eafd07b12bcf7b026d7d23a1500035':
Add separate permission and group for access to the MTP USB driver
2011-01-10 09:28:00 -08:00
Mike Lockwood
16c1c55f07
am 5e63e251: Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb
...
* commit '5e63e2515f3f0d2712d80f2cb27f263f8d3d1081':
Add separate permission and group for access to the MTP USB driver
2011-01-10 09:26:31 -08:00
Mike Lockwood
5e63e2515f
Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb
2011-01-10 09:24:46 -08:00
James Dong
681e89c082
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object
...
bug - 3336424
Change-Id: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89
2011-01-10 08:57:50 -08:00
Leon Scroggins
eb8484616c
am c7fe090d: am aa6b9f55: Do not show autofill++ or saved form data in incognito mode.
...
* commit 'c7fe090d2fa9e238c48183b48971b1d3c58b8fad':
Do not show autofill++ or saved form data in incognito mode.
2011-01-10 08:34:52 -08:00
Leon Scroggins
c7fe090d2f
am aa6b9f55: Do not show autofill++ or saved form data in incognito mode.
...
* commit 'aa6b9f55d60702211dd2d08403c7296347f0bd7d':
Do not show autofill++ or saved form data in incognito mode.
2011-01-10 08:32:56 -08:00
Cary Clark
a3ee56f4ae
add more alt key acceleration in webview
...
Make key accceleration exact; if alt is required,
allow only alt, and so on.
Also, set the touch point when nav'ing with the arrows
or trackball so that context menus have a point to
work with.
bug:3301564
bug:3241968
Change-Id: I574ce145941e84ac0934efd323d9db71eec11663
2011-01-10 11:20:56 -05:00
Leon Scroggins
aa6b9f55d6
Do not show autofill++ or saved form data in incognito mode.
...
Bug:2968399
Also do not save the form data in incognito mode.
Change-Id: Ice6a1cb3620b5cf272b6b361ce11f8abef269a89
2011-01-10 11:02:00 -05:00
Cary Clark
8ffa04f47b
am 297c1acc: am 8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb
...
* commit '297c1acc79a474a413fa881da8d3b5154fc59824':
scroll selected text in scrollable layers
2011-01-10 07:33:57 -08:00
Cary Clark
297c1acc79
am 8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb
...
* commit '8733bea4c1631cf1d6758c45d5f2a279f7d66eed':
scroll selected text in scrollable layers
2011-01-10 07:29:03 -08:00
Cary Clark
8733bea4c1
Merge "scroll selected text in scrollable layers" into honeycomb
2011-01-10 07:25:33 -08:00
Cary Clark
b9aaa776a6
scroll selected text in scrollable layers
...
Compute whether the initial tap point is in
a scrollable layer or not. If it is, get
the bounds of the scrollable layer and use them,
clipped to the view, to determine when the
select anchor is dragged close to the layer's
edge, to invoke autoscrolling.
Fix some bugs around stopping the autoscrolling
when there is nothing to do, and when a motion
up event is sent.
requires companion change in external/webkit
bug:3191699
Change-Id: Ic9229b063a8102ec93d0cd5bcaba774cc170c106
2011-01-10 09:10:25 -05:00
Mike Lockwood
10bc1114f3
Add separate permission and group for access to the MTP USB driver
...
Since the "usb" group and ACCESS_USB permission will be used by regular apps
to access USB devices in host mode, we need a separate permission for the
device side MTP driver.
Change-Id: Id03f7c4f3d2712c489b4b74cf17a72a182084501
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 08:54:34 -05:00
Adam Powell
3cff902b34
am 38f0c2ee: am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
...
* commit '38f0c2ee8a67865cb7fc493c76a1881d54a2c79a':
Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
2011-01-09 21:41:19 -08:00
Adam Powell
38f0c2ee8a
am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
...
* commit '8b50495d02a6423bfa5c8cf6406e3e06b7c84f7f':
Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
2011-01-09 21:39:49 -08:00
Adam Powell
8b50495d02
Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
2011-01-09 21:38:05 -08:00
Adam Powell
32c3a6929a
Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
...
The fast scroller now always positions by index position.
Fixed a bug with always-show fast scrollers.
Change-Id: I08586ab2aae9733e78aa823aff711bcc14d2d44d
2011-01-09 21:34:21 -08:00
Louis Huemiller
72417c2574
am 391da8cc: am 6b22a994: Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb
...
* commit '391da8ccaaac77d003bbd12b7fb64d244d9e70af':
Hardware Composer Test Lib HBlen off by 1
2011-01-09 20:21:20 -08:00
Louis Huemiller
391da8ccaa
am 6b22a994: Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb
...
* commit '6b22a99481d8fadbd7f8c56b2c3b7dbc28ddd0de':
Hardware Composer Test Lib HBlen off by 1
2011-01-09 20:19:49 -08:00
Louis Huemiller
6b22a99481
Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb
2011-01-09 20:17:30 -08:00
Jeff Hamilton
0091091a3c
am e3db3d62: Merge commit \'525f953b\' into manualmerge
...
* commit 'e3db3d6209c234e032775079a1e1489478dabf86':
Make the new NFC APIs public.
2011-01-09 19:04:15 -08:00
Louis Huemiller
081ce9fec3
Hardware Composer Test Lib HBlen off by 1
...
Change-Id: If51727a041e20afa307e5d1735b77da5a54a712b
2011-01-09 19:02:05 -08:00
Jeff Hamilton
e3db3d6209
Merge commit '525f953b' into manualmerge
...
Conflicts:
api/current.xml
Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
2011-01-09 21:01:56 -06:00
Xavier Ducrohet
c77515e590
LayoutLib: display warning when a resource reference fails to resolve.
...
Also fixed some warnings where a field hid one from a parent class.
Change-Id: I04ed19ebc49ae0bb0abdb0b25bc1c182fa0db440
2011-01-09 18:11:54 -08:00
Stephen Hines
1ac9da6717
Split time functions into rs_time.rsh header.
...
Change-Id: I598b0031d15749c91d11fbd37b075d0564a94dbf
2011-01-09 17:04:18 -08:00
Jason Sams
73d7779e2e
am f7c60a05: am e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb
...
* commit 'f7c60a05bf610ad9cb6914a296dfebb72f1ad2c5':
Fix cleanup race condition where objects might may not be cleaned up correctly.
2011-01-09 16:50:15 -08:00
Jason Sams
f7c60a05bf
am e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb
...
* commit 'e06c3a599f5d274ef7b1afa694ac2b1961f75aeb':
Fix cleanup race condition where objects might may not be cleaned up correctly.
2011-01-09 16:48:25 -08:00