Romain Guy
193187afbc
am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421 " into ics-mr1
...
* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
Ensure we have an EGL context when building layers Bug #5638421
2011-11-22 12:34:23 -08:00
Romain Guy
26dd54f87c
Merge "Ensure we have an EGL context when building layers Bug #5638421 " into ics-mr1
2011-11-22 12:33:04 -08:00
Teng-Hui Zhu
d437629339
am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
...
* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
HTML5 Video runs into super full screen mode
2011-11-22 08:56:37 -08:00
Teng-Hui Zhu
7257a32b9a
Merge "HTML5 Video runs into super full screen mode" into ics-mr1
2011-11-22 08:54:59 -08:00
Mangesh Ghiware
b61dddc8fa
am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
...
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
Update zoom (aka display) density from WebView thread.
2011-11-21 23:16:14 -08:00
Mangesh Ghiware
8d03007f80
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
2011-11-21 23:14:05 -08:00
Romain Guy
f6286e5e9a
am 1766b0e2: Fix the build
...
* commit '1766b0e25de5a66f9d0f6e73a2c342272fcadc71':
Fix the build
2011-11-21 18:31:35 -08:00
Romain Guy
1766b0e25d
Fix the build
...
Change-Id: I3814c6c39eda2a4b56902e2044fbb121b4885e5d
2011-11-21 18:28:49 -08:00
Wu-cheng Li
fcc9f9be1f
am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
...
* commit 'e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
Move Camera.Sound to a stand-alone class CameraSound.
2011-11-21 18:13:16 -08:00
Wu-cheng Li
e7005ec958
Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
2011-11-21 18:10:52 -08:00
Romain Guy
f0401bc1fa
am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899 " into ics-mr1
...
* commit '8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
Notify views when EGL resources are about to be destroyed Bug #5639899
2011-11-21 17:58:40 -08:00
Romain Guy
8cd39e3a10
Merge "Notify views when EGL resources are about to be destroyed Bug #5639899 " into ics-mr1
2011-11-21 17:57:05 -08:00
Romain Guy
d0609e41ab
Ensure we have an EGL context when building layers
...
Bug #5638421
This bug was introduced by the recent changes that force more frequent
flushes of the GL renderer.
Change-Id: I55dd4ace6ba1e70ab41927150d6c60c37d7fb196
2011-11-21 17:21:15 -08:00
Mangesh Ghiware
31f263db65
Update zoom (aka display) density from WebView thread.
...
Fixes bug 5639675.
Change-Id: I982ca0787f5c050c5d1a288cd8751299ee351214
2011-11-21 17:19:31 -08:00
Teng-Hui Zhu
f45aa7da2b
HTML5 Video runs into super full screen mode
...
bug:5569146
Browser change
https://android-git.corp.google.com/g/#/c/151035/
Change-Id: Ib8449a670caf4aa2b540a170ed5e9f6adea2b12e
2011-11-21 16:56:08 -08:00
Nick Pelly
7dffeeefbb
am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
...
* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 16:05:33 -08:00
Nick Pelly
043a8b149d
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
2011-11-21 16:03:40 -08:00
Nick Pelly
a5cb9f4217
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
...
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.
The package name is also reverted from com.android.nfc3 to com.android.nfc
The NFC uid needs to get bumped (25 to 27) to allow the cert change.
Bug: 5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
2011-11-21 14:55:29 -08:00
John Reck
ced6262e93
am 0507ac4d: Use isHighEndGfx to determine texture pool
...
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
Use isHighEndGfx to determine texture pool
2011-11-21 14:14:11 -08:00
John Reck
0507ac4d94
Use isHighEndGfx to determine texture pool
...
Bug: 5639612
Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
2011-11-21 13:30:32 -08:00
Romain Guy
31f2c2e946
Notify views when EGL resources are about to be destroyed
...
Bug #5639899
Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
2011-11-21 10:55:41 -08:00
Wu-cheng Li
0cac6aa993
Move Camera.Sound to a stand-alone class CameraSound.
...
bug:5640219
Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926
2011-11-21 17:57:33 +08:00
Kristian Monsen
98dbf35ff3
am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
...
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
Improving PictureListener deprecating comments
2011-11-20 07:28:35 -08:00
Kristian Monsen
7859c1842c
Merge "Improving PictureListener deprecating comments" into ics-mr1
2011-11-20 07:26:59 -08:00
Daniel Sandler
75d8eb2a81
am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
...
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
Dreams (now Screen Candy) development.
2011-11-19 20:44:36 -08:00
Daniel Sandler
9b5d7a59f3
Merge "Dreams (now Screen Candy) development." into ics-mr1
2011-11-19 20:42:19 -08:00
Svetoslav Ganov
44e3a8a4ac
am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
...
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
Text selection AccessibilityEvents are missing text.
2011-11-18 14:41:09 -08:00
Svetoslav Ganov
d8a3cabcb1
Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
2011-11-18 14:39:05 -08:00
Wei Huang
2361032a4d
am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
...
* commit 'c2fff5ea39027d017dc15ce285961afa17a7b4a7':
Unlock camera AWB lock only when white-balance is changed.
2011-11-18 14:02:15 -08:00
Wei Huang
c2fff5ea39
Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
2011-11-18 14:00:09 -08:00
Bart Sears
29df4a87a7
am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
...
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
Content and viewport rects set in one step.
2011-11-18 11:49:40 -08:00
Bart Sears
e6a96560ed
Merge "Content and viewport rects set in one step." into ics-mr1
2011-11-18 11:46:26 -08:00
Svetoslav Ganov
84dd52e394
Text selection AccessibilityEvents are missing text.
...
The text selection change event was not added to the text
populating accessibility events in View.
bug:5638709
Change-Id: Ie7e319bc07d7e6c48f178a6c1bd22b1fe32ff515
2011-11-18 10:26:54 -08:00
Kristian Monsen
4aad1022eb
Improving PictureListener deprecating comments
...
Change-Id: If189823962c49db9681845996e97eec31fedcca6
2011-11-18 17:09:12 +00:00
Daniel Sandler
2d54536d08
Dreams (now Screen Candy) development.
...
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"
Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
2011-11-18 08:00:04 -08:00
Wu-cheng Li
b838d8d4a2
Unlock camera AWB lock only when white-balance is changed.
...
bug:5633546
Change-Id: I90bb4b5b445daedf38a64e2f8fb980fc0f0aaa81
2011-11-18 15:21:47 +08:00
Matthew Xie
430d36fef9
am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
...
* commit '2b9af44e401d884469869a4ac0933bfa727d3135':
Check the bluetooth state for getUuid call
2011-11-17 13:12:39 -08:00
Matthew Xie
2b9af44e40
am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
...
* commit '6da97a24e329851888890d4e380066037d08bcd7':
Check the bluetooth state for getUuid call
2011-11-17 13:10:14 -08:00
Nick Pelly
480f50f483
am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
...
* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
Fix NPE on devices that don't have NFC.
2011-11-17 12:50:39 -08:00
Nick Pelly
63b7360e9d
Merge "Fix NPE on devices that don't have NFC." into ics-mr1
2011-11-17 12:48:48 -08:00
Michael Kolb
7e0e2dc28d
am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
...
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
Draw input field focus ring in WebTextView
2011-11-17 12:24:43 -08:00
Michael Kolb
852585c034
Merge "Draw input field focus ring in WebTextView" into ics-mr1
2011-11-17 12:22:58 -08:00
Michael Kolb
edb39ce5b4
Draw input field focus ring in WebTextView
...
Bug: 5628053
Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
2011-11-17 11:08:59 -08:00
John Reck
65926fa6b8
am 775e986e: Merge "Fix add single character check" into ics-mr1
...
* commit '775e986ece16b90d3260fe8c7f8e18fc3d0cf492':
Fix add single character check
2011-11-17 08:52:00 -08:00
John Reck
0483a235f6
am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
...
* commit '1da3d656358ab577f285d06e9db249dfb21cb8e3':
Undeprecate LayoutAlgorithm
2011-11-17 08:49:28 -08:00
John Reck
775e986ece
Merge "Fix add single character check" into ics-mr1
2011-11-17 08:48:04 -08:00
John Reck
1da3d65635
Merge "Undeprecate LayoutAlgorithm" into ics-mr1
2011-11-17 08:47:29 -08:00
George Mount
82ed95f410
Content and viewport rects set in one step.
...
Bug 5342918
The content rect of the WebView was being retrieved during
the draw while the viewport rect was being set when the
draw functor was setup. During animations, the content
rect was changing between the time the draw functor was
retrieved and it was executed. The content rect is now
being set with the viewport rect.
Wekbkit Change: I05d68dcc
Change-Id: I1b0978eeb27d9f1deddfeba3ede869f735f74394
2011-11-17 08:31:55 -08:00
Ben Murdoch
01802fadd0
am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
...
* commit 'fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 02:15:34 -08:00
Ben Murdoch
fead0e14b4
Merge changes I59323dc5,I31a01aa3 into ics-mr1
...
* changes:
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 02:13:19 -08:00