35574 Commits

Author SHA1 Message Date
Jeff Brown
1202c43685 Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 2012-10-24 12:14:08 -07:00
Baligh Uddin
c1e2466502 Import translations. DO NOT MERGE
Change-Id: I035193bae4235a54f721473ff5db4f63e1b1b4ae
Auto-generated-cl: translation import
2012-10-24 12:10:45 -07:00
Baligh Uddin
c1b2060b17 Import translations. DO NOT MERGE
Change-Id: I60e51769668cbf4823155238a51cdac84b4b49af
Auto-generated-cl: translation import
2012-10-24 12:08:18 -07:00
Zhihai Xu
11181c7ae6 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 11:01:15 -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
John Spurlock
86b6357e5e Manual f/b merge of lockhotness camera integration.
Change-Id: I5c7c3c49e13656e9ba4a3761be7d503642d5b76f
2012-10-24 13:30:02 -04:00
Adam Powell
848a5557db Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev 2012-10-23 21:54:42 -07: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
Jim Miller
19a5267003 Merge latest prototype changes into keyguard
Change-Id: Ibec6e9a7667ec730a25a58226c3203332af64b24
2012-10-23 19:52:04 -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
ce1696c22a am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
  Add throwing InvalidDisplayException from addView.
2012-10-23 16:56:17 -07:00
Craig Mautner
6757572b39 Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 2012-10-23 16:53:32 -07:00
Adam Powell
962159addd Fix up GlowPadView attributes
Change-Id: I98c14177753e713fcdaaf886c44ce10ab49eebc9
2012-10-23 16:09:40 -07:00
Chet Haase
4a4ae0b7e2 am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
* commit 'fbba753f62f13a12d9287c67921d1ea60e92768d':
  Handle offscreen animations correctly
2012-10-23 15:48:35 -07:00
Chet Haase
fbba753f62 Merge "Handle offscreen animations correctly" into jb-mr1-dev 2012-10-23 15:46:04 -07:00
Romain Guy
aae03bb4e3 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:23 -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
0e259dccfc 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:23 -07:00
Andy McFadden
2eb8303b9c am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
* commit 'd401a53c6472921ce7785059195a4f031feea7cc':
  Improve systrace tag propagation
2012-10-23 15:24:20 -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
Daniel Sandler
69bdee7c87 Integrate new PIN pad.
Change-Id: I08d6551dfde501c5526eb6fd641ae08475c1365b
2012-10-23 16:45:50 -04: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
Chris Wren
3867ddabbe Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 2012-10-23 12:29:05 -07:00
Romain Guy
0472d565f3 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:01 -07:00
Chris Wren
692bb13352 merge new multiuser avatars in from proto app
Change-Id: I6a7f63738279be1c036061b4cea461e94fb51658
2012-10-23 13:48:38 -04:00
Romain Guy
04c8d402fa Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev 2012-10-23 10:47:56 -07:00
Baligh Uddin
bd28f2376f Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-23 10:42:49 -07:00
Baligh Uddin
21ce854b50 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-23 10:39:27 -07:00
Baligh Uddin
2107dcbd5c Import translations. DO NOT MERGE
Change-Id: Ia49d738d4c123d06cc8ef2a31a18aa7156816d26
Auto-generated-cl: translation import
2012-10-23 10:06:53 -07:00
Justin Ho
c1c03c429a am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
* commit '5d6562d34cb088f3468021b8bbdf8d75b68dca68':
  Avoid mentioning hidden API in docs.
2012-10-23 10:05:22 -07:00
Baligh Uddin
1c8e4dc101 Import translations. DO NOT MERGE
Change-Id: I6d7f8dec6e1115a4586befbaa302eafe606fb901
Auto-generated-cl: translation import
2012-10-23 10:03:00 -07:00
Jeff Sharkey
b76a0c40d4 Avoid mentioning hidden API in docs.
Change-Id: If83c179ec0d1b038e94a7fdca386c8ddf324e391
2012-10-23 09:37:54 -07:00
Jeff Sharkey
32a1c5f7d6 am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
* commit '1c8135adba37ac09fe661180237df446611daa4b':
  Update docs for multi-user storage behavior.
2012-10-23 09:11:10 -07:00
Jeff Sharkey
1c8135adba Merge "Update docs for multi-user storage behavior." into jb-mr1-dev 2012-10-23 09:08:42 -07:00
Jim Miller
5d3f859959 Merge multi-user stuff from prototype into framework.
Change-Id: I195b588ecfcea3388a2489fe7278a851202380c6
2012-10-22 20:45:56 -07:00
Romain Guy
41308e2936 Properly draw the window background on window resize
Bug #7385090

This change gets rid of two silly asumptions:
- That a layer needs to be cleared with opaque black (it shouldn't,
it's already cleared to transparent and the view will cover it up
with its own background)
- The the clip should be dirty at the beginning of a frame only
when the render target is opaque

Change-Id: I415b6d3cab196057fb0281419a53fef601a44e28
2012-10-22 20:02:43 -07:00
Andy McFadden
d11ca4dd2c Improve systrace tag propagation
The native side of the tracing code latches a copy of the tags from a
system property on first use.  The Java-side tracing code latches a
copy of the native's copy during class init.  The tracing code is
preloaded by the zygote, which means we get the flags during zygote
init and don't update them when we launch a new app.

This changes the Java sources to also defer initialization until
first use, so that newly-launched apps will use the current value
of the system property.

Bug 7323431

Change-Id: I7db048ec54345ae9565088a35c2e2b4c82f993fd
2012-10-22 19:35:39 -07:00
Jim Miller
022554e3da Merge latest prototype changes into keyguard
- multi-user avatar stuff.
- new SlidingChallengeLayout changes.

Change-Id: I45bec7313b71dbca16544e7525281bf6c0e44a25
2012-10-22 19:06:05 -07:00
Jim Miller
c28261d4fa Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 2012-10-22 18:52:37 -07:00
erin rosenthal
9415aa1c1b am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
* commit '36425d19fc578c2042098d2045092990a811d0e6':
  Catch badly formed URLs in WebView accessibility injector.
2012-10-22 17:56:27 -07:00
erin rosenthal
36425d19fc Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev 2012-10-22 17:53:27 -07:00
Raph Levien
9ed957c20f am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
* commit '74437532fe2a3e9ebd15c61327fd3f2b68c299b3':
  Fix for bug: Gmail (and other places): cursor placed on top of letter
2012-10-22 15:59:14 -07:00
Raph Levien
74437532fe Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev 2012-10-22 15:56:01 -07:00
Chet Haase
8f87ea2da6 am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
* commit '74261d847f64ccfeba0a7f08f6c59473a3b6647d':
  Don't null the reference to Bitmap pixels until we're really ready
2012-10-22 15:50:08 -07:00
Chet Haase
74261d847f Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev 2012-10-22 15:46:43 -07:00