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

35859 Commits

Author SHA1 Message Date
Jim Miller
bf83ea6aa3 am 5d3f8599: Merge multi-user stuff from prototype into framework. 
* commit '5d3f8599590026d6fc275739613fe6ddb180af55':
  Merge multi-user stuff from prototype into framework.
 2012-10-29 09:16:45 -07:00
Jim Miller
8615a071c4 am 022554e3: Merge latest prototype changes into keyguard 
* commit '022554e3da6e496524387a5d3ecc67ef9749b587':
  Merge latest prototype changes into keyguard
 2012-10-29 09:16:41 -07:00
Jim Miller
17ac77c767 am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c28261d4fabf186cd5af5a563e6bab9023ee3758':
  Wire up "add widget" in keyguard
 2012-10-29 09:16:37 -07:00
Baligh Uddin
712556f5f2 Import translations. DO NOT MERGE 
Change-Id: Ifec8cc64e9047964d26ac167583e81949d7f4826
Auto-generated-cl: translation import
 2012-10-28 10:14:37 -07:00
Jim Miller
52c55cd0d0 am d6523da1: Merge latest prototype changes into the framework 
* commit 'd6523da1ad7bae805a3dbea8d7b398d86cd3c181':
  Merge latest prototype changes into the framework
 2012-10-26 15:24:28 -07:00
Jim Miller
13056c982a am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev 
* commit '28f1f5e6f9a9f4a8a5e82fcb58c8dfadca7b5f93':
  Get basic keyguard working in new branch
 2012-10-26 15:24:15 -07:00
Baligh Uddin
45a4aff0cc am 2fa64ac6: am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2fa64ac65689a325fdf05ee32608300efa4c05c2':
 2012-10-26 15:21:12 -07:00
Baligh Uddin
a625e8a344 am 19b304e7: am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '19b304e79a05227b6d607dead013c3856e739678':
 2012-10-26 15:18:17 -07:00
Chet Haase
b36dca1b04 am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev 
* commit '9023cf91018c75a179d04256fd4e306065528117':
  Set wallpaper bitmap reference to null before reloading
 2012-10-25 12:23:14 -07:00
Chet Haase
9023cf9101 Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev 2012-10-25 12:19:34 -07:00
Chet Haase
589a6af173 Set wallpaper bitmap reference to null before reloading 
Give the GC a chance to collect the current bitmap if it needs to,
as it allocates memory for the next one. This helps avoid OOM situations
that can sometimes occur in extreme circumstances (huge bitmaps)

Also set the default_wallpaper to the right default size.

Issue #7352961 Wallpaper edge is cut-off while scrolling through home page

Change-Id: If76b55061d04b29af7f66a6162e307b8b53bf4ae
 2012-10-25 11:57:09 -07:00
Fabrice Di Meglio
3b53061e6d am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
 2012-10-25 11:44:47 -07:00
Fabrice Di Meglio
3e297339f8 Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 2012-10-25 11:41:20 -07:00
Fabrice Di Meglio
72898e9828 FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants 
- made them private and final
- fixed comment

Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
 2012-10-25 11:22:39 -07:00
Dianne Hackborn
72d0a5aa04 am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:02:05 -07:00
Dianne Hackborn
ead7d90e8b Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 2012-10-24 17:58:13 -07:00
Dianne Hackborn
b26306ad52 Fix issue #7408647: Add getUserCount() API 
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
 2012-10-24 15:28:03 -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
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
Baligh Uddin
0fa4cf5bb5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-24 12:15:05 -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
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
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
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
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
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
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
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
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
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
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
21ce854b50 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-23 10:39:27 -07:00
Baligh Uddin
7fcea3eecc Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-23 10:37:59 -07:00
Justin Ho
bab415da35 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:28 -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