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
Conley Owens
88c2d4d26d
am f139965e: (-s ours) am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
...
* commit 'f139965e4acc8eadb57f1d18d34ea3a89ab622d0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:55:22 -07:00
Conley Owens
f139965e4a
am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
...
* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:47:50 -07:00
Conley Owens
45ddd42544
am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
...
* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:44:57 -07:00
Svetoslav Ganov
35bfedeaba
Touch exploration separate setting and API to poll the latter state.
...
1. Seperated touch exploration to be a seperate setting rather being
magically enabled by the system of accessiiblity is on the there
is at leas one accessibility service that speaks enabled. Now
there is a setting for requesting touch exploration but still the
system will enabled it only if that makes sense i.e. accessibility
is on and one accessibility service that speaks is enabled.
2. Added public API for checking of touch exploration is enabled.
3. Added description attribute in accessibility service declaration
which will be shown to the user before enabling the service.
4. Added API for quick cloning of AccessibilityNodeInfo.
5. Added clone functionality to SparseArray, SparseIntArray, and
SparseBooleanArray.
bug:5034010
bug:5033928
Change-Id: Ia442edbe55c20309244061cd9d24e0545c01b54f
2011-07-18 12:44:08 -07:00
Conley Owens
3edba93fd9
am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
...
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:42:42 -07:00
Conley Owens
98fcc4041d
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
2011-07-18 12:37:16 -07:00
Chet Haase
eb1d851e0e
Fixed animation ordering bug in LayoutTransition.
...
This bug caused an artifact in Recent Apps where you might see things
pop to their end location before popping back and then animating correctly
into place.
Change-Id: Ia7313ec76cc42162528c3c167b8bc562284b14bc
2011-07-18 12:12:36 -07:00
Wink Saville
cd4636ec08
Add LteOnCdmaDevice system property.
...
Provide a system property which may be
optionally set at build time.
Change-Id: I253ff0df7c8f8c5627c775fb0cff2cb831157eed
2011-07-18 11:32:55 -07:00
Dianne Hackborn
d94b71de3b
Merge "Work on death recipient leaks in Activity Manager and Content Service."
2011-07-18 11:30:16 -07:00
Jean-Michel Trivi
211f5af3bb
Merge "Add option to query hardware decoders only"
2011-07-18 11:07:47 -07:00