Commit Graph

3908 Commits

Author SHA1 Message Date
Fabrice Di Meglio
46e62fe398 am 024e70c8: am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '024e70c8156a0fa2d702ff2fba4a38c1f6b68f98':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 17:13:23 -07:00
Fabrice Di Meglio
dd80335edd am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 13:55:46 -07:00
Jeff Brown
266ca72300 am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '46a0ec73b6d4a81dd037d7beef7321f25349bf9c':
  Add MediaRouter API to get presentation display.
2012-10-29 13:43:14 -07:00
Jeff Brown
14012e1d1b am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
  Add MediaRouter API to get presentation display.
2012-10-29 13:32:02 -07:00
Fabrice Di Meglio
07ce0ca265 Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 2012-10-26 15:18:30 -07:00
Fabrice Di Meglio
1957d281ea Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
- check layout direction previous value in the onResolveDrawables(int) callback
- dont do any Drawables resolution if we cannot resolve the layout direction
- also remove unnecessary call to resolveRtlPropertiesIfNeeded() in ViewGroup when
  adding a child as the call to resolveRtlPropertiesIfNeeded() will be done into
  the measure() call itself later

Change-Id: I62237af3d307dfea203f7f2865551d1c61a0e0b8
2012-10-26 10:55:02 -07:00
Jeff Brown
92130f6407 Add MediaRouter API to get presentation display.
This new API makes it possible for an application to ask on
which Display it should show a Presentation based on the currently
selected media route.

Also added a new API on DisplayManager to query displays that
support a certain category of uses.

Improved the documentation of the Presentation class to explain
how to choose an appropriate Display for presentation.

Bug: 7409073
Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
2012-10-25 20:31:21 -07:00
Fabrice Di Meglio
809312791c am 0182dc39: am 3b53061e: 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 '0182dc39bd969b797614c90e44978b83ac57fd1c':
  FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:50:07 -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
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
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
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
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
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