Nick Kralevich
52cfb0ccc7
am 369852eb: am 7e007ff8: Merge "Sensors could be disabled by any application"
...
* commit '369852ebdea6a5843e299000c57baac89282b154':
Sensors could be disabled by any application
2012-10-24 16:52:21 -07:00
Nick Kralevich
369852ebde
am 7e007ff8: Merge "Sensors could be disabled by any application"
...
* commit '7e007ff83738a83f43cb59ddc023a2b860367074':
Sensors could be disabled by any application
2012-10-24 16:50:32 -07:00
Nick Kralevich
7e007ff837
Merge "Sensors could be disabled by any application"
2012-10-24 16:29:06 -07:00
Bo Liu
7cd2baf4ce
Remove CacheManager implementation
...
CacheManager will not be implemented with webviewchromium. So removing
existing implemntation in WebViewClassic.
Change-Id: I82d3a156ba898393cc12080f8150841cd76f187a
2012-10-24 16:00:01 -07:00
Romain Guy
144b59adb1
am f323fd07: am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit 'f323fd07ba75b8bc13470a22f698937345bc9f0d':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:58:49 -07:00
Romain Guy
f323fd07ba
am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit '4344f20959b6591f484d20012a398d7fefe8a8fb':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:56:27 -07:00
Romain Guy
4344f20959
am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:53:46 -07:00
Romain Guy
9933331506
Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
2012-10-24 13:50:45 -07:00
Jeff Brown
2af7e72229
am 5bac2df4: am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '5bac2df4d69f096fa8c858bcb3713b7af9e977f8':
Secure windows, secure surface views and secure displays.
2012-10-24 12:22:01 -07:00
Jeff Brown
5bac2df4d6
am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit 'b43269acddb7061c43fa6ace6a896c51a9bf4dce':
Secure windows, secure surface views and secure displays.
2012-10-24 12:19:59 -07:00
Jeff Brown
b43269acdd
am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
Secure windows, secure surface views and secure displays.
2012-10-24 12:17:16 -07:00
Jeff Brown
1202c43685
Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
2012-10-24 12:14:08 -07:00
Zhihai Xu
99fc7d9c94
am 843031b0: am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit '843031b03eaa062a59f467bd3e00f88d5f87adba':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:52:10 -07:00
Zhihai Xu
843031b03e
am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit 'a656971e73a09c8aa01f8a2922865ea00df43758':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:50:16 -07:00
Zhihai Xu
a656971e73
am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit '8e080d7e10dd17662750605538a9799af66494e9':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:48:01 -07:00
Zhihai Xu
8e080d7e10
Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
2012-10-24 10:44:16 -07:00
Torne (Richard Coles)
a9bbd9439c
Rename Chromium-powered WebView package.
...
The Chromium-powered WebView package has been renamed from
com.android.webviewchromium to com.android.webview.chromium. Reflect
this renaming in the factory.
Change-Id: I64ba2b54c52aad8f10eef68d12366ce9be09b9c8
2012-10-24 11:59:22 +01:00
Jeff Brown
f0681b34df
Secure windows, secure surface views and secure displays.
...
Add new API to determine whether a display is secure.
Add new API to make a SurfaceView secure.
Clarify documentation.
Bug: 7368436
Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
2012-10-23 20:37:40 -07:00
Romain Guy
bd17bd3431
Ensure we have a GL context before deleting View layers
...
Bug #7391098
The existing code was doing a make current to guarantee we have a
current context. This can however fail when the surface is destroyed
which could lead to GL calls without an EGL context, and therefore
potential leaks. This change fixes the issue by using a technique
found in HardwareRenderer.destroyHardwareResources(). If the surface
is not available then we use a special 1x1 pbuffer as a way to get
a valid context.
Change-Id: I716d3799bf90120d793d76e90a83956837ecd491
2012-10-23 19:17:15 -07:00
Zhihai Xu
fa0fd39a4b
License of files Bluetooth package is not updated to ASL2
...
bug 7385618
Change-Id: I6232f537f4fda979d3aabe3a059c11d3299de9b8
2012-10-23 17:31:56 -07:00
Craig Mautner
990c1b7f3e
am a170dcb7: am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
...
* commit 'a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c':
Add throwing InvalidDisplayException from addView.
2012-10-23 17:04:22 -07:00
Craig Mautner
a170dcb7b6
am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
...
* commit '9e96c69e3e9ebdb820acd347b4691c32a5d76be4':
Add throwing InvalidDisplayException from addView.
2012-10-23 17:01:20 -07:00
Craig Mautner
9e96c69e3e
am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
...
* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
Add throwing InvalidDisplayException from addView.
2012-10-23 16:57:11 -07:00
Craig Mautner
6757572b39
Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
2012-10-23 16:53:32 -07:00
Chet Haase
16a5ad8345
am 4a82a0fc: am f5fa64f2: am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
...
* commit '4a82a0fc09f4743b59b5de483329fb76e60aab07':
Handle offscreen animations correctly
2012-10-23 15:54:35 -07:00
Chet Haase
4a82a0fc09
am f5fa64f2: am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
...
* commit 'f5fa64f24b0ee6aa53ac2803590e8729122c445b':
Handle offscreen animations correctly
2012-10-23 15:51:24 -07:00
Romain Guy
5d7cc93625
am be815669: am 9389d447: am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903 " into jb-mr1-dev
...
* commit 'be815669d1c41a95f79222aaa7caa4462bddfb2d':
Use existing display list to render the resize buffer Bug #7400903
2012-10-23 15:49:40 -07:00
Chet Haase
f5fa64f24b
am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
...
* commit 'fbba753f62f13a12d9287c67921d1ea60e92768d':
Handle offscreen animations correctly
2012-10-23 15:48:40 -07:00
Romain Guy
be815669d1
am 9389d447: am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903 " into jb-mr1-dev
...
* commit '9389d447c175b4ef9fb85cd296f53cf24be4fd7d':
Use existing display list to render the resize buffer Bug #7400903
2012-10-23 15:46:59 -07:00
Chet Haase
fbba753f62
Merge "Handle offscreen animations correctly" into jb-mr1-dev
2012-10-23 15:46:04 -07:00
Romain Guy
9389d447c1
am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903 " into jb-mr1-dev
...
* commit 'b75ade9cce02dffb967ff4719381254585074c58':
Use existing display list to render the resize buffer Bug #7400903
2012-10-23 15:44:26 -07:00
Romain Guy
b75ade9cce
Merge "Use existing display list to render the resize buffer Bug #7400903 " into jb-mr1-dev
2012-10-23 15:41:42 -07:00
Craig Mautner
6018aeec27
Add throwing InvalidDisplayException from addView.
...
Throw an InvalidDisplayException to addView if the display being
added to has been removed. Handle this exception in Dialog.show()
by removing the view after it has been added and rethrow the
exception from there.
Add javadoc to ViewManager.addView and Presentation.show explaining
the new exception and how best to handle it.
Bug: 7368565 partially fixed. It remains for the Videos app to
handle Presentation.show throwing the InvalidDisplayException.
Change-Id: Ib4303c9b3f7bf7a0cfa95d19bd60a0c128658c48
2012-10-23 15:34:29 -07:00
Chet Haase
3561d062ff
Handle offscreen animations correctly
...
A bug in software rendering caused animations on views that are offscreen
to not get drawn, therefore the animation doesn't continue (since old-style
animations depend on the logic in the drawing code to keep running). Fix is
to special case the isAnimating case in ViewRoot to go ahead and schedule
a traversal even if the dirty rect does not intersect with the visible region.
Issue #7396035 Animations starting offscreen don't draw run/end/draw properly (sw rendering only)
Change-Id: Iae25b3a424ddc5a16ba431ecd68cf42d5500db3f
2012-10-23 15:30:15 -07:00
Jamie Gennis
8b9750c1bb
am fec93f67: am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
...
* commit 'fec93f67190f7ced8578130e2340dee0e4010a33':
Surface: add the PhysicalDisplayInfo#secure field
2012-10-23 15:29:47 -07:00
Andy McFadden
273eb1f588
am 357da18b: am 30fd55cf: am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
...
* commit '357da18b44206bc35727ee5366e2e4968ce340b0':
Improve systrace tag propagation
2012-10-23 15:29:41 -07:00
Jamie Gennis
fec93f6719
am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
...
* commit '39c68da57b443c869378263b8063da6e821a1b6d':
Surface: add the PhysicalDisplayInfo#secure field
2012-10-23 15:27:10 -07:00
Andy McFadden
357da18b44
am 30fd55cf: am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
...
* commit '30fd55cf986077cb21fd7c86e365e1e6f096cffb':
Improve systrace tag propagation
2012-10-23 15:27:06 -07:00
Jamie Gennis
39c68da57b
am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
...
* commit 'cd79b35c3828e0ebf4c9e68da75f9d857ccf01db':
Surface: add the PhysicalDisplayInfo#secure field
2012-10-23 15:24:29 -07:00
Andy McFadden
30fd55cf98
am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
...
* commit 'd401a53c6472921ce7785059195a4f031feea7cc':
Improve systrace tag propagation
2012-10-23 15:24:25 -07:00
Jamie Gennis
cd79b35c38
Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
2012-10-23 15:22:37 -07:00
Andy McFadden
d401a53c64
Merge "Improve systrace tag propagation" into jb-mr1-dev
2012-10-23 15:21:56 -07:00
Jamie Gennis
95429c3d1b
Surface: add the PhysicalDisplayInfo#secure field
...
Bug: 7368436
Change-Id: I38bf7bbfca354380c30da7516f628cf40416d350
2012-10-23 15:07:22 -07:00
Adam Powell
b09aadeda5
am a23f69a8: am 86e0d95d: Merge "Reattach header view after DPAD scroll."
...
* commit 'a23f69a8782e0edeff815cfb5275f2864fc1d19e':
Reattach header view after DPAD scroll.
2012-10-23 15:03:55 -07:00
Adam Powell
a23f69a878
am 86e0d95d: Merge "Reattach header view after DPAD scroll."
...
* commit '86e0d95de1007d339af467c1484b09878ee528fc':
Reattach header view after DPAD scroll.
2012-10-23 15:01:43 -07:00
Adam Powell
86e0d95de1
Merge "Reattach header view after DPAD scroll."
2012-10-23 14:04:19 -07:00
Romain Guy
3a2d6aaf8e
Use existing display list to render the resize buffer
...
Bug #7400903
Change-Id: Ia2e534e47b4f67c280e2de7ce99cae0202751c42
2012-10-23 13:25:13 -07:00
Romain Guy
573f1429a0
am 2635e743: am d04fe3c1: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit '2635e7431a74b89c338ea9d56715f94b9c328cc1':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:58:12 -07:00
Romain Guy
2635e7431a
am d04fe3c1: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit 'd04fe3c1aeaf4ce63f6a6f3def61a8cc5faff705':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:53:40 -07:00
Romain Guy
d04fe3c1ae
am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090 " into jb-mr1-dev
...
* commit '04c8d402fa824c548dc5de82c56e63eb5df02371':
Properly draw the window background on window resize Bug #7385090
2012-10-23 10:51:14 -07:00