54802 Commits

Author SHA1 Message Date
Romain Guy
0b06cb62f5 Merge "Update TextureView.lockCanvas() test." 2011-07-18 17:51:59 -07:00
Fabrice Di Meglio
c2063a5b18 Fix bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing
- optimization for single run case was broken
- pass isRTL boolean along the call stack instead of the dirFlags integer
  (which was only used as a "isRTL" in the shaper)
- update unit tests

Change-Id: I33110b76a433633a0b92fbd1db03785204e0c3e6
2011-07-18 17:47:04 -07:00
Romain Guy
3c2c9e4e0d Update TextureView.lockCanvas() test.
Change-Id: Ib0f613fcd6ba64a696936e4e2b386b96d76b828a
2011-07-18 17:45:04 -07:00
Fabrice Di Meglio
8abef6b014 Merge "Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing" 2011-07-18 17:43:11 -07:00
Amith Yamasani
b4569fb17f SearchView behavioral and visual changes
Align text suggestions and search string.
Close button only clears the field.
Back button clears focus, hides dropdown and keyboard.
Tweaked SearchDialog's use of SearchView to follow above patterns.
Fixed other little bugs.

Change-Id: I9d34c2ebe2b1b2ca887220894c19a26809db85f6
2011-07-18 17:32:24 -07:00
Doug Kwan
3ad4d3ce01 Merge "Add C code to use BDADDR_ANY macro properly. The macro expands into code that is not valid C++. So we need to use a C helper." 2011-07-18 17:02:55 -07:00
Conley Owens
9fd12cfb56 am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:57:04 -07:00
Conley Owens
e5143d6c09 am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:55:33 -07:00
Conley Owens
a4aef41a74 am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:53:41 -07:00
Conley Owens
a74774fd91 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
2011-07-18 16:52:26 -07:00
Conley Owens
4d8f6a38e7 Merge "stagefright aacenc: Mark codeWord as UWord16" 2011-07-18 16:49:43 -07:00
Adam Powell
c27cc947e4 Merge "Make the theme attribute actionModeStyle public." 2011-07-18 16:29:53 -07:00
Adam Powell
00db5195ab Make the theme attribute actionModeStyle public.
Change-Id: I53cd5e88dbd9df83c3e171277ce4a4da5faf8a8c
2011-07-18 16:28:55 -07:00
Dianne Hackborn
6dd005b481 I. Can. Not. Stand. ViewAncestor.
It was done so we would have the name "ViewRoot" available for a
public API.  However, the name "ViewAncestor" just makes no sense.
So instead, change it to ViewRootImpl.

Change-Id: If9599ca67896f339f6fefa7d1dde121201171d97
2011-07-18 16:16:23 -07:00
Romain Guy
f40aa3834d Merge "Trim OpenGLRenderer's memory usage whenever possible" 2011-07-18 16:06:31 -07:00
Dianne Hackborn
822036d00e Merge "Fix issue # 5017868: Twitter crashes on start:" 2011-07-18 16:03:08 -07:00
Mike Lockwood
395765a9cb Merge "UsbManager: document that passing null setCurrentFunction restores default function" 2011-07-18 15:59:35 -07:00
Fabrice Di Meglio
c6f247ca31 Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing
Change-Id: Ic71a563ad0f4ba6de5b7f030f04a3a9615b7617c
2011-07-18 15:59:10 -07:00
Deckard Autoverifier
2b15115fee am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
  stagefright: Include stdlib.h for malloc/free
2011-07-18 15:46:26 -07:00
Deckard Autoverifier
d1cada2ad8 am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit 'b32af642454f3113cb1539821eb3b0dbf4174974':
  stagefright amrwbenc: Remove a duplicate, unused file
2011-07-18 15:46:21 -07:00
Deckard Autoverifier
a09fe88148 am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
2011-07-18 15:46:18 -07:00
Deckard Autoverifier
e1928190ff am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
2011-07-18 15:46:14 -07:00
Deckard Autoverifier
3ab6ccda44 am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  stagefright: Include stdlib.h for malloc/free
2011-07-18 15:44:03 -07:00
Deckard Autoverifier
b32af64245 am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '31140598866c668047fc6dede7944e146aa21a0a':
  stagefright amrwbenc: Remove a duplicate, unused file
2011-07-18 15:44:01 -07:00
Deckard Autoverifier
d4dee1a57f am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
2011-07-18 15:43:58 -07:00
Deckard Autoverifier
b7f0d825c5 am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
2011-07-18 15:43:54 -07:00
Deckard Autoverifier
2acddc54e1 am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '89bac1820f3788d655ae293ec9a65c18226e09ee':
  stagefright: Include stdlib.h for malloc/free
2011-07-18 15:41:31 -07:00
Deckard Autoverifier
3114059886 am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '16db83c26442f5e25b6aad77a37b612fa0be9862':
  stagefright amrwbenc: Remove a duplicate, unused file
2011-07-18 15:41:29 -07:00
Deckard Autoverifier
29fd8cdbe5 am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '80ef1745d00c235b117e389e56e58210cf88e5c8':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
2011-07-18 15:41:26 -07:00
Deckard Autoverifier
691257b181 am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '68e37dacc065eebb971d443722b7a8413ff403d6':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
2011-07-18 15:41:24 -07:00
Deckard Autoverifier
89bac1820f am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
  stagefright: Include stdlib.h for malloc/free
2011-07-18 15:38:30 -07:00
Deckard Autoverifier
16db83c264 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
  stagefright amrwbenc: Remove a duplicate, unused file
2011-07-18 15:38:27 -07:00
Deckard Autoverifier
80ef1745d0 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
2011-07-18 15:38:25 -07:00
Deckard Autoverifier
68e37dacc0 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '55f115a3214343c826acf27fcbc4bf2927049083':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
2011-07-18 15:38:22 -07:00
Deckard Autoverifier
88409911ae Merge "stagefright: Include stdlib.h for malloc/free" 2011-07-18 15:23:41 -07:00
Deckard Autoverifier
eb07c53149 Merge "stagefright amrwbenc: Remove a duplicate, unused file" 2011-07-18 15:23:31 -07:00
Deckard Autoverifier
c06c3603e0 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 2011-07-18 15:23:20 -07:00
Deckard Autoverifier
55f115a321 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 2011-07-18 15:23:09 -07:00
Jamie Gennis
a97eba3d48 Merge "CameraService: (dis)connect from preview windows" 2011-07-18 15:19:20 -07:00
Jamie Gennis
5a4ab16eba Merge "MediaPlayer: add ANativeWindow (dis)connect calls" 2011-07-18 15:18:43 -07:00
Philip Milne
682dbafc8f Merge "Derive GridLayout's 'gap' constants from new "default_gap" entry in dimens.xml." 2011-07-18 15:17:06 -07:00
Romain Guy
6be3d5561c Add lock/unlockCanvas to TextureView
With this change, TextureView has feature parity with SurfaceView.

Change-Id: I4ef2da33420fc9590f868636ae72a5a6de61965b
2011-07-18 15:02:06 -07:00
Jamie Gennis
f4f79ac42a Merge "SurfaceTexture: add a multi-SurfaceTexture test" 2011-07-18 15:00:54 -07:00
Romain Guy
bdf7609867 Trim OpenGLRenderer's memory usage whenever possible
Change-Id: I9225077184f374b1a43300add15cc1d5b6869d1c
2011-07-18 15:00:43 -07:00
Mathias Agopian
10e6f34a67 Merge "move lock/unlock implementaion outside of Surface into SurfaceTextureClient" 2011-07-18 14:55:58 -07:00
Chet Haase
49840e255b Merge "Fix leftover artifacts from sliding Recents items out" 2011-07-18 14:40:54 -07:00
Jesse Wilson
a11c2f8674 Merge "Track line and column when parsing JSON." 2011-07-18 14:39:39 -07:00
Philip Milne
b0ce49b5ad Derive GridLayout's 'gap' constants from new "default_gap" entry in dimens.xml.
Also:

. removed static import of R.styleable - this is non-standard
. removed final modifier from DEBUG flag,
	this prevents the compiler from excluding the debugging code but
	allows debugging code to be enabled externally
. added override to removeAllViews() as GridLayout needs to be notified whever hiearchy changes.

Change-Id: I2409289bce7c6638eff320ffd48a6c0704e77fa8
2011-07-18 14:38:14 -07:00
Jesse Wilson
febae4ed18 Track line and column when parsing JSON.
This is a prerequisite to skipping the BOM if it exists.
Bug: http://code.google.com/p/android/issues/detail?id=18508

Change-Id: I38b1c46f246d8526fa20859b50ca3e25c9f9b9d1
2011-07-18 14:37:22 -07:00
Jesse Wilson
1a1d731c9c Merge "Always escape chars that JavaScript treats as newlines." 2011-07-18 14:27:31 -07:00