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
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
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
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
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
Jamie Gennis
cd79b35c38
Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
2012-10-23 15:22:37 -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
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
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
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
Jamie Gennis
e8c18cb36b
am 5bbfcd3e: am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '5bbfcd3e15048f94310da6cba85be8ab047c0e8b':
Set the secureness when creating displays
2012-10-22 13:57:55 -07:00
Jamie Gennis
9fee7bd73d
am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
Set the secureness when creating displays
2012-10-22 13:52:12 -07:00
Jamie Gennis
23d622418b
Merge "Set the secureness when creating displays" into jb-mr1-dev
2012-10-22 13:49:35 -07:00
Adam Powell
c5b9ea70b9
am f4c6a4e4: am cad6dce5: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'f4c6a4e42e11a8bf829335426d67be92b0e7ab5c':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:37:34 -07:00
Adam Powell
cad6dce596
am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:31:35 -07:00
Adam Powell
5311c4476e
Remove View's long press callbacks when ACTION_CANCEL is received
...
Bug 7391646
Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
2012-10-22 12:15:49 -07:00
Daniel Sandler
c2c4f8d895
am 50ad6326: am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
...
* commit '50ad6326c5814d092cf1510847bcdfb940a46738':
New lockscreen: allow search gesture from nav bar.
2012-10-22 08:07:05 -07:00
Daniel Sandler
466b77e995
am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
...
* commit '2dd0c3a576925be4b5f0438a57af626e6e162e0e':
New lockscreen: allow search gesture from nav bar.
2012-10-22 08:02:32 -07:00
Daniel Sandler
2dd0c3a576
Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
2012-10-22 07:59:18 -07:00
Fabrice Di Meglio
3c371b28ef
am 0be6a28e: am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
...
* commit '0be6a28ed5f27217d66c69195524d8747a6975bc':
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
2012-10-19 19:22:05 -07:00
Fabrice Di Meglio
08f27b1bff
am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
...
* commit '59420ecd1518289cc47c32181250539c981f85f0':
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
2012-10-19 19:17:06 -07:00
Fabrice Di Meglio
d3156a2a56
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
...
This was a regression introduced by a previous CL.
- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.
The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.
Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
2012-10-19 18:46:43 -07:00
Jamie Gennis
7bbf8163fb
Set the secureness when creating displays
...
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method. In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.
Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
2012-10-19 18:34:35 -07:00
Daniel Sandler
d5483c3157
New lockscreen: allow search gesture from nav bar.
...
Show a lights-out pip if home is invisible but search is
still OK.
Change-Id: Ifc69c12296cc8e8cf7c89dd06173d7abf499a878
2012-10-19 16:48:12 -04:00
Fabrice Di Meglio
da391700c9
resolved conflicts for merge of e549a602 to master
...
Change-Id: I37dc0e48321d4baea49d77b6ef22bca19dcb0d9b
2012-10-19 12:49:30 -07:00
Fabrice Di Meglio
af26ac3130
am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
...
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:36:12 -07:00
Fabrice Di Meglio
398a6713c3
Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
2012-10-19 11:33:01 -07:00
Romain Guy
41974cdf7b
am be432fa0: am eb78cf53: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
...
* commit 'be432fa01cc5995bcab162369c47454903a5ae55':
Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:47:32 -07:00
Romain Guy
eb78cf538f
am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
...
* commit '8b946c055ddd90cf79cd407c9f68a013d5d24c2a':
Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:43:04 -07:00
Romain Guy
8b946c055d
Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
2012-10-19 10:40:28 -07:00
Craig Mautner
d8a9073a31
am 59a9cc18: am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '59a9cc18f30d2ba2aec952bcf3a65b1774986a40':
Allow getDisplayContentLocked to return null...
2012-10-19 09:34:35 -07:00
Craig Mautner
444354d2c6
am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
Allow getDisplayContentLocked to return null...
2012-10-19 09:30:06 -07:00
Craig Mautner
0ed07a0a30
Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
2012-10-19 09:27:06 -07:00
Dave Burke
0b9b415632
am b1f434c1: am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
...
* commit 'b1f434c16eefb028ef441ba40df8abe1e087a4eb':
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
2012-10-18 21:09:48 -07:00
Dave Burke
744b4dca34
am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
...
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
2012-10-18 21:05:29 -07:00
Dave Burke
09a5321c60
Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
2012-10-18 21:02:13 -07:00
Dave Burke
579e14016c
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
...
This reverts commit 57fca90ac6
Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
b003e28c1d
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
...
- set the popup layout direction depending on the anchor view's layout direction
(if not defined before)
- make first pass of ViewRootImpl.performTraversals() and configuration update
not override any layout direction that could have been set before
Change-Id: I8e86ca805f0caf52c058d06aa7861df56fb862e6
2012-10-18 18:02:56 -07:00
Fabrice Di Meglio
c38684af87
am 4c2db5f2: am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
...
* commit '4c2db5f2a579132f6b6861c50d7ff99bb6c8035c':
Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:29:00 -07:00
Fabrice Di Meglio
8de328c996
am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
...
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
45c77ca0f6
Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
2012-10-18 16:20:36 -07:00