drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,675 Commits 1 Branch 0 Tags
Commit Graph

36319 Commits

Author SHA1 Message Date
Michael Jurka
aa2859ae61 Adding ability to add multiple widgets to keyguard 
Bug: 7381803
 2012-10-24 17:41:34 -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
Adam Powell
eee209313d Beginnings of bouncer support; add scrims and state tracking 
Integrating from prototype app

Change-Id: Ib142cf371c5997f547266d8af7e25129fb4e1343
 2012-10-24 16:33:44 -07:00
Nick Kralevich
7e007ff837 Merge "Sensors could be disabled by any application" 2012-10-24 16:29:06 -07:00
Dianne Hackborn
b26306ad52 Fix issue #7408647: Add getUserCount() API 
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
 2012-10-24 15:28:03 -07:00
Adam Powell
c0657fb36c Integrate changes from lockscreen proto app 
Fix padding/layout issues in MultiPaneChallengeLayout

Change-Id: I610b4c0cc321a690fa29d071d6a960c05ffbe3a7
 2012-10-24 14:01:37 -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
ee0f615ffd 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:43 -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
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
Baligh Uddin
985dc14264 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-24 12:19:01 -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
d9fb5848c8 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:04 -07:00
Baligh Uddin
0fa4cf5bb5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-24 12:15:05 -07:00
Baligh Uddin
f7b191a3cf am c1afd568: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'c1afd56898cf41692f128329a1d104650791daf2':
  Import translations. DO NOT MERGE
 2012-10-24 12:14:48 -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
Baligh Uddin
c1afd56898 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-24 12:11:09 -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
Baligh Uddin
af185e7dbf Import translations. DO NOT MERGE 
Change-Id: Ibde369e39b0ba2da783f00795aabe9769e47e1d0
Auto-generated-cl: translation import
 2012-10-24 12:06:04 -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
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
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
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
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
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
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
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
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
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
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