Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,440 Commits 3 Branches 0 Tags
fc3cacdb0e05db0710e536d1bed6795eaa35d0c2
Commit Graph

3600 Commits

Author SHA1 Message Date
Fabrice Di Meglio
c1432543f6 am f119af67: am 41148af5: Merge "Fix bug #7241988 Padding is mostly set to "0"" into jb-mr1-dev 
* commit 'f119af675b77e34e791d3b02cae9401d0fdcfc06':
  Fix bug #7241988 Padding is mostly set to "0"
 2012-09-28 00:34:18 -07:00
Philip Milne
f7da569774 Merge "Optical bounds support for LinearLayout, TableLayout and TableRow." 2012-09-27 15:08:11 -07:00
Philip Milne
ad365cc217 Optical bounds support for LinearLayout, TableLayout and TableRow. 
The generic support for optical bounds provided in:

https://googleplex-android-review.googlesource.com/#/c/228269/

did not work correctly for nested LinearLayouts. With this fix
all the layouts in the APIdemos now seem to layout correctly
when the optical bounds mode is enabled.

(There's currently no, user level, way to do this. Instead, the
optical bounds layout mode has to be enabled on a per view basis.)

Change-Id: Id3d1d84445a8a2df277ddfe679c42f2d6cf775f4
 2012-09-27 14:46:36 -07:00
Fabrice Di Meglio
bbd1029b70 Fix bug #7241988 Padding is mostly set to "0" 
- make RTL compatibility mode more straighforward. Done only in constructor
and resolved() is only done for real RTL case.

- fix also issue concerning needRtlPropertiesResolution(): we were missing
padding and drawables bits.

Change-Id: Ic0569f7542a0d66244e8c4bd35ae85949e39c559
 2012-09-27 14:08:49 -07:00
Adam Powell
6649ae314b am 221abd23: am 5a864aa0: Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev 
* commit '221abd23b1b4e8f3139ca675634696ba5360c8b8':
  ScaleGestureDetector bugfixes
 2012-09-26 17:24:45 -07:00
Adam Powell
5a864aa0d8 Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev 2012-09-26 17:20:37 -07:00
Adam Powell
abde042a82 ScaleGestureDetector bugfixes 
* Use radius, not diameter.

* Properly determine initial span on ACTION_DOWN.

Change-Id: Ia1dcff6589f8226181a9beaecef34440e9e16330
 2012-09-26 17:12:50 -07:00
Jesse Hall
5d7b4368d9 am bbe1860a: am 62fbb831: Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev 
* commit 'bbe1860ae38b96d4d347990d1fb857e978828224':
  Document interaction of SurfaceView and post-layout transforms
 2012-09-26 14:39:45 -07:00
Jesse Hall
62fbb8311a Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev 2012-09-26 14:34:44 -07:00
Fabrice Di Meglio
d28c3643a6 am 21289957: am fea9df63: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '21289957a91213c922236deb6010dbde1d652c5e':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-26 13:58:11 -07:00
Fabrice Di Meglio
fea9df6386 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-26 13:54:16 -07:00
Romain Guy
1c8cd46a09 am 83b6c24e: am 54ea6bf2: Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev 
* commit '83b6c24e612a0bf625c24502a3c0b7617a85af50':
  Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
 2012-09-26 13:47:48 -07:00
Romain Guy
bd43152bda Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR 
Bug #7221173

Change-Id: I231a47187792c93af9e3b9321fd1e25bc2f20117
 2012-09-26 13:36:47 -07:00
Jesse Hall
c9f345ff7b Document interaction of SurfaceView and post-layout transforms 
Bug: 7179570
Change-Id: I9c4d71242bcb832c0cb3b62ec26aba54f146d70a
 2012-09-26 12:07:12 -07:00
Adam Powell
4a22625b7d am 82c6fa58: am e8e2b672: Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 
* commit '82c6fa5898be4730bdb26f2d4e79df1314840ca2':
  Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
 2012-09-25 19:40:22 -07:00
Adam Powell
d736d2069b Further tweak touchMajor/Minor stabilization in ScaleGestureDetector 
Change-Id: Ifa717c7dee96c5a2eb18a414a257f01762365b00
 2012-09-25 19:30:44 -07:00
Adam Powell
823de2070f am b7066338: am b4693e25: Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev 
* commit 'b706633863ba616133c0976078885b7c81d4591e':
  Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
 2012-09-25 17:21:19 -07:00
Adam Powell
a4ce6ae0d3 Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector. 
Bug 7199099

Change-Id: I7268268237cc690c2ff952d4b2cd2ddc6dce2ca5
 2012-09-25 16:21:53 -07:00
Svetoslav Ganov
b2caa627be am a5d09204: am 1908cf9e: Merge "Fixing argument expectations of View.requestRectangleOnScreen" into jb-mr1-dev 
* commit 'a5d09204ff87539147163807428265ce857ee618':
  Fixing argument expectations of View.requestRectangleOnScreen
 2012-09-25 15:50:31 -07:00
Svetoslav Ganov
989ae759f8 Fixing argument expectations of View.requestRectangleOnScreen 
1. In a previous patch the implementation of the method was fixed
   in terms of end result but this broke some assumptions about the
   method arguments. This change updates the argument expectations.

bug:7172035

Change-Id: I76d738b1c74dfb1dd45fc667f3217911f1c10a5f
 2012-09-25 15:16:54 -07:00
Romain Guy
f5481b7332 am 9e309c2f: am 64339168: Merge "Don\'t destroy the same texture twice Bug #7221449" into jb-mr1-dev 
* commit '9e309c2f5b747dbbac4ac2c1fe8452c8e22f3132':
  Don't destroy the same texture twice Bug #7221449
 2012-09-25 13:30:04 -07:00
Eric Laurent
2d13830718 am 6d09e321: am 4bbcc654: Display a fixed volume silder when docked. 
* commit '6d09e32144926222c065a4bfd631f5962eaa3256':
  Display a fixed volume silder when docked.
 2012-09-25 13:29:37 -07:00
Fabrice Di Meglio
1f88ba8bf6 Fix bug #6427629 Clean up layout direction APIs 
- getLayoutDirection() / getTextDirection() / getTextAligment() dont do resolution
- resolution done into onMeasure()
- use XX_RESOLVED bits to check if resolution needs to be done
- code formatting

Change-Id: Ie46a5535860e90f3449b96cfe0aa04dd7e3006d7
 2012-09-25 12:50:17 -07:00
Romain Guy
ef09a210dd Don't destroy the same texture twice 
Bug #7221449

SurfaceTexture already deletes the GL texture when detachFromContext
is invoked. The newly introduced refcount would casue the Layer
object to be destroyed later and attempt to delete the GL texture
again. By the time the second cleanup occurs, the texture name
might have been reused by somebody else, resulting in erroneous
behaviors.

Change-Id: I257c589fea64b34c00f46fbfaa7732e6854a5e41
 2012-09-25 12:22:21 -07:00
Eric Laurent
4bbcc65497 Display a fixed volume silder when docked. 
Align UI indication to volume policy when docked: the music volume
cannot be adjusted when docked or connected to HDMI. Display
a disabled slider at max volume in this case to be consistent.

Bug 4335692.

Change-Id: I6f8db143b0e2ecf54e4bdacd88afdeb661a98a18
 2012-09-25 10:28:05 -07:00
Romain Guy
ed1b6f4fc0 Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
 2012-09-25 09:44:35 -07:00
Romain Guy
c002936e4b Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
 2012-09-25 09:43:23 -07:00
Jean-Baptiste Queru
ec1996131d Merge into jb-mr1-dev 
Change-Id: I97ff2551b36a1b590f2d314cabfcf198dd10f404
 2012-09-25 09:35:19 -07:00
Jean-Baptiste Queru
c68accd35e Merge into jb-mr1-dev 
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
 2012-09-25 09:28:32 -07:00
Romain Guy
0c3df4308d am d38bc618: am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit 'd38bc618bc0e55e52f0575f51f145dcfec1c983b':
  Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 21:49:42 -07:00
Romain Guy
eea774a1f6 Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 21:45:13 -07:00
Romain Guy
bf3e77d46d Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
 2012-09-24 21:42:18 -07:00
Philip Milne
8c549d6ffe Merge "Bug #6110465. Optical bounds support for all ViewGroup subclasses." 2012-09-24 20:55:00 -07:00
Romain Guy
eebe0267f4 Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 20:44:09 -07:00
Romain Guy
fb9e6cc275 Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
 2012-09-24 20:18:13 -07:00
Jeff Brown
c5a2b1a6f3 Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev 
* changes:
  Fix surface view on secondary display.
  Fix drag and drop surfaces on secondary displays.
  Allow a window on a secondary display to have focus.
 2012-09-24 17:38:23 -07:00
Romain Guy
dd6d7841fd Merge "Add extra error check when eglCreateContext fails Bug #7216919" into jb-mr1-dev 2012-09-24 15:39:48 -07:00
Romain Guy
4c7dc4aa5c Add extra error check when eglCreateContext fails 
Bug #7216919

Change-Id: I322cbe4579d7a4eb2a64d288175e145d0badc857
 2012-09-24 15:35:33 -07:00
Jeff Brown
8d0243a3d0 Fix surface view on secondary display. 
Bug: 7183618
Change-Id: I8d743b5db8f362afb97f720846d990f9a722b3bd
 2012-09-24 15:02:15 -07:00
Fabrice Di Meglio
793d9abb89 am c86c9fc0: am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'c86c9fc092280cb961bf46e87050da9c46836278':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:39:15 -07:00
Fabrice Di Meglio
c60a19e368 am 402bab75: am be4c5dd9: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '402bab75c360fd038910b3baedff54a1f4762c3d':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:39:07 -07:00
Fabrice Di Meglio
525926078b am 72d65718: am 239e4305: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '72d657182312c7bac049b3ed94a4658c3935ae28':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:38:51 -07:00
Fabrice Di Meglio
42f11c981c am c81a319f: am e3f2ac9e: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'c81a319f1a2834590f1b7e5cfed0bbdba49d0838':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:38:43 -07:00
Dianne Hackborn
749bbe97ee am 55fd212f: am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev 
* commit '55fd212f914a28d0a64202a09f0127fa0a1b4175':
  Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
 2012-09-24 09:38:36 -07:00
Romain Guy
d2926e4a25 am 454f2be1: am 8e586f61: Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev 
* commit '454f2be11f028b49d28154103996a3e71e935272':
  Add support for a new developer setting: overdraw debugging
 2012-09-24 09:37:34 -07:00
Svetoslav Ganov
412201a944 am 631b6380: am 0a5c5567: Merge "Multi-user support for the accessibility layer." into jb-mr1-dev 
* commit '631b63804e448d5a29e4089a1ad1804cf0279480':
  Multi-user support for the accessibility layer.
 2012-09-24 00:52:23 -07:00
Jeff Brown
d571122db5 am 1022a785: am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev 
* commit '1022a785e52384dc8503127df1ceaababcd88a1a':
  Support HDMI hotplug.
 2012-09-24 00:51:06 -07:00
Fabrice Di Meglio
f7a3e979a7 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:45:51 -07:00
Fabrice Di Meglio
1a7d487380 Fix bug #6427629 Clean up layout direction APIs 
- rename getResolvedTextAlignment() to getTextAlignment()

Change-Id: I6a2b6c9ec4f5cea1adde46e35d5f3c49880791ee
 2012-09-23 16:19:58 -07:00
Fabrice Di Meglio
be4c5dd9d0 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:19:03 -07:00