Todor Kalaydjiev
a0c229d2ef
Manually bring change Ie8fb8162 to master ("Add images to ERI icon list"). Fixes b/4604593.
...
Change-Id: I1d8233e898ee79a33fc765b9013fa8f77d9fe914
2011-07-18 17:55:24 -07:00
Romain Guy
0b06cb62f5
Merge "Update TextureView.lockCanvas() test."
2011-07-18 17:51:59 -07:00
Stephen Hines
c27d187569
Extract BC metadata using a single call.
...
BUG=4278636
Change-Id: Idc056c4fa50240aadbc81d300fbed759c5a187cf
2011-07-18 17:49:44 -07:00
Chet Haase
75755e23f3
Don't recreate view's display list when size hasn't changed
...
Minor optimization in setFrame(), to force recreation of
a view's display list only when the actual size of the view has
changed.
Change-Id: Id07bd6943beec30de731ae8469ba881f5c0d9ac6
2011-07-18 17:48:25 -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
Gilles Debunne
88160de283
Layout changes in Settings
...
Conforming to the mocks: changing padding, height... on phones
and 7".
Change-Id: I8aa1fc78002fb19932037714c67ebeba7b707ef4
2011-07-18 17:44:23 -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
Doug Felt
3d0124f176
Test Gallery layout direction.
...
Change-Id: If88f559e8cc46bb72ed45f33d7fc52802f1e1246
2011-07-18 17:39:07 -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
Colin Cross
1e9f56cf9e
Allow BoardConfig.mk to define an extension to dumpstate
...
If BoardConfig.mk defines BOARD_LIB_DUMPSTATE, link to that library
and call dumpstate_board(), which can dump debugging information that
only make senses on one device.
Change-Id: I2c5006a1a04b02cf26fd73575047ac176f222616
2011-07-18 17:30:13 -07:00
Chris Craik
5888ec2b30
Added TileBenchmark
...
Adds TileBenchmark app, which loads pages in webview and scrolls through them
automatically, measuring rendering and allocation information.
Change-Id: Ieaf5bbcec604c99aaf16822915e58bfc495011ec
2011-07-18 17:24:48 -07:00
Shimeng (Simon) Wang
6050cf65db
Add in i18n TLDs and new TLDs to the URL RegEx matcher.
...
issue: 4384739
Change-Id: I96f2263d9a14fc2560583e2719cf7c5ac5c46d9e
2011-07-18 17:24:14 -07:00
Jeff Brown
487c38b842
Remove an unnecessary finalizer.
...
Simply having a finalizer impacts the GC's ability to
reclaim resources in a timely manner.
Change-Id: Ia9e5f6f1dcb50fae8c2819d25d167df751adf451
2011-07-18 17:03:20 -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
f178737f82
Fix bug 5031652 - offer a way to associate metadata with an ActionMode
...
Change-Id: Ic9d453b5c58eea922ec65423801e008d953bb25b
2011-07-18 16:32:00 -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
Wu-cheng Li
10e09c69d6
Add camera new picture and new video broadcast intents.
...
bug:4964321
Change-Id: I42b45cda2e6a30f3bdf6127e2594933f32ecbaeb
2011-07-19 06:19:26 +08:00
Jamie Gennis
a97eba3d48
Merge "CameraService: (dis)connect from preview windows"
2011-07-18 15:19:20 -07:00