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
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
Fabrice Di Meglio
989571eeca
Merge "Fix resolution padding glitch"
2011-07-18 14:26:45 -07:00
Fabrice Di Meglio
46c7250798
Merge "Clean test APIs for Harfbuzz support"
2011-07-18 14:26:34 -07:00
Chet Haase
c986b3598c
Fix leftover artifacts from sliding Recents items out
...
When items were removed from the Recents list, the removeViewInLayout()
method was being called instead of removeView(). This avoided proper
layout and invalidation from occurring, which sometimes resulted in
detritus on the screen since the framework wasn't updating the area
last occupied by the item.
Change-Id: I43132d06df1714f00c399d34908e4d6dd0a8d5c6
2011-07-18 14:03:21 -07:00
Jamie Gennis
054d5c5740
Merge "EGL: update EGL_ANDROID_recordable extension."
2011-07-18 13:36:19 -07:00
Dianne Hackborn
78f80b4e71
Fix issue # 5017868: Twitter crashes on start:
...
unable to resolve static field 106 (DEBUG) in Landroid/util/Config
Config was removed, but apparently some apps are actually using it.
Put it back.
Change-Id: Iebcb94b1158abc5e8c3dd9855068d2e9223d8999
2011-07-18 13:20:04 -07:00
Chet Haase
abb7d66049
Merge "Fixed animation ordering bug in LayoutTransition."
2011-07-18 13:07:34 -07:00
satok
91e88122cf
Enable IMEs to set additional subtypes in background
...
Bug: 4591792
Change-Id: I7e61a576c56d1a3a56001bdf2fd51ad3801add01
2011-07-19 04:59:48 +09:00
Jim Miller
b5d4f97126
Merge "Fix 5023708,4689527: Add popups and overlays to recents. Misc bug fixes."
2011-07-18 12:59:36 -07:00
Jim Miller
c0d2731047
Fix 5023708,4689527: Add popups and overlays to recents. Misc bug fixes.
...
Adds selection overlay to recents to comply with UX design.
Adds longpress popup for removal and inspection of items.
Change-Id: Ic23c3f135b6ed107cc5156505d8f163daa94c52e
2011-07-18 12:57:40 -07:00
Svetoslav Ganov
b44f8f4e22
Merge "Touch exploration separate setting and API to poll the latter state."
2011-07-18 12:57:02 -07:00
Jesse Wilson
0fc0edfd27
Always escape chars that JavaScript treats as newlines.
...
Related GSON Bug: http://code.google.com/p/google-gson/issues/detail?id=341
Change-Id: I41b1615c4b3b4526f2223a75191f9b0699cdda12
2011-07-18 12:56:42 -07:00