Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,904 Commits 3 Branches 0 Tags
63ff094e88307a69cad3ed5fc146eeeb2c4ace07
Commit Graph

27904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
63ff094e88 am ac8e7060: am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 
Merge commit 'ac8e7060e09cc8eecc3f959691185bf156939404'

* commit 'ac8e7060e09cc8eecc3f959691185bf156939404':
  Don't return a decoder error if the encoded stream does not start with SPS/PPS.
 2010-08-05 11:46:12 -07:00
Andreas Huber
0a3858b0de am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 
Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'

* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
 2010-08-05 11:46:04 -07:00
Kenny Root
0645f9699c am 1cd6340a: am 50871525: Add more debugging to installd 
Merge commit '1cd6340a72d81c81630d6374ed46211497520897'

* commit '1cd6340a72d81c81630d6374ed46211497520897':
  Add more debugging to installd
 2010-08-05 11:45:54 -07:00
Jaikumar Ganesh
56b6fcaa7a am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread 
Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c'

* commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c':
  Add Blocked Device property.
 2010-08-05 11:45:44 -07:00
Eric Fischer
135a75c69d am c1b387ae: (-s ours) am d89443d8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3'

* commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3':
  Import revised translations.  DO NOT MERGE
 2010-08-05 11:44:01 -07:00
Eric Laurent
ff43836b88 am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbread 
Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067'

* commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067':
  Fix issue 2876124.
 2010-08-05 11:43:45 -07:00
Dmitri Plotnikov
2ef9d2538f Changing the protocol for Directory registration. 
Change-Id: I1ba51d4198617121a9a5f86d22e91dfa9917c94b
 2010-08-05 11:27:44 -07:00
Alex Sakhartchouk
c318c29d56 Merge "Fixing fonts to use constant color instead of variable." 2010-08-05 11:27:11 -07:00
Alex Sakhartchouk
55e8198356 Fixing fonts to use constant color instead of variable. 
Change-Id: Ia590dfed482f82b7bc748c25b7b1592efea5b68c
 2010-08-05 11:24:14 -07:00
Marco Nelissen
3e5fd52205 Resolve conflicts for commit '3ce65633' 
Change-Id: I7ad67f68ce30a9fc4492f8291eded28d19aa65dd
 2010-08-05 11:23:14 -07:00
Kenny Root
ce845d7301 am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread 
Merge commit 'c5183acae55e08f4bfcb58aa122a200863748a63'

* commit 'c5183acae55e08f4bfcb58aa122a200863748a63':
  Only allow one movePackage operation in-flight
 2010-08-05 10:47:15 -07:00
Alex Sakhartchouk
518f033b68 Adding more matrix math functions. 
Fixing build.

Change-Id: Ie0f6724ba063ada94d1d44d99bbe56e21d9bd72f
 2010-08-05 10:28:43 -07:00
Jason Sams
442a647424 Support constant and varying colors in ProgramFragment. 
Change-Id: I16ce84ff427016f3a1923594efc718eca32dd7f2
 2010-08-05 10:00:21 -07:00
Robert Greenwalt
208c425e84 Merge "Fix runtime reset (missing case break)." 2010-08-05 08:17:09 -07:00
Daniel Sandler
0f0b11c871 Basic support for notification payloads in the panel. 
Line-item veto is there, but allows you to cancel some
notifications you probably shouldn't be canceling. (Should
hide the "X" in those cases.)

No preference given to "sticky" notifications, because
there's no such thing yet.

Notifications are now limited to 4 visible icons, per spec.
The implementation is a total hack for now.

Change-Id: Ibdf433ae94189117f983c510fe5e0cff0bf5c44c
 2010-08-05 09:34:50 -04:00
Eric Laurent
4e68d506b0 resolved conflicts for merge of acc4e683 to master 
Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
 2010-08-05 02:53:22 -07:00
Daniel Sandler
1a655771ef Fix runtime reset (missing case break). 
Bug: 2895437
Change-Id: If061c02811144031833f75ad47ae313e2208701c
 2010-08-04 23:57:00 -04:00
Oscar Montemayor
e728ca93fd Updated API after unhinding a hidden element. 
Change-Id: Ie76702bf0bf161f6ebb5a48db7d4ac89364ebafb
 2010-08-04 19:56:48 -07:00
Oscar Montemayor
8063589c6c Removed extra parameter tag in JavaDocs 
Change-Id: I0bc6f201d12a95a7c96b3fac90688d113a554d22
 2010-08-04 18:34:12 -07:00
Oscar Montemayor
f7c851749d Merge "Fix for SDK breakage with hidden field." 2010-08-04 18:28:43 -07:00
Oscar Montemayor
ac54fb9da1 Fix for SDK breakage with hidden field. 
Change-Id: If66c31b8823a886e9a0853b63ef9bbdf25dc9a71
 2010-08-04 18:24:14 -07:00
Vasu Nori
b6d1437f32 fix build breakage 
eclipse doesn't complain but our build does..

Change-Id: If0289b68e91e7eb2ae7a9b7bd90d5cb6b728e944
 2010-08-04 18:05:00 -07:00
Adam Powell
8e552630e7 Let action modes overlay window content 
Change-Id: Ic0512c3e6338e1de15facec0a6650f9da9808a24
 2010-08-04 17:42:44 -07:00
Oscar Montemayor
2cd1dbe50d Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists." 2010-08-04 17:15:25 -07:00
Manuel Roman
96183e16e4 Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown" 2010-08-04 16:42:55 -07:00
Oscar Montemayor
c4c9df3d71 Merge "Device Policy Manager changes to enable Global Proxy." 2010-08-04 16:25:01 -07:00
Irfan Sheriff
8525f5dc4a Merge "Avoid hostname lookup in NetworkProperties" 2010-08-04 16:07:13 -07:00
Oscar Montemayor
b8f66019ad Fix for bug 2890320 Browser crashes, after adding bookmark. 
Fixed Proxy class locking and dealing with empty exclusion lists.

Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
 2010-08-04 16:07:02 -07:00
Oscar Montemayor
69238c6a37 Device Policy Manager changes to enable Global Proxy. 
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
 2010-08-04 16:01:56 -07:00
Xia Wang
a69fbc8eff Switch to new enum definition in RilCmds 
Change-Id: Id6173d92a1c8d136b037448e2df55ea9ef49d34e
 2010-08-04 15:39:24 -07:00
Romain Guy
42d530f18a Merge "Fix native crash in SkiaShader." 2010-08-04 15:35:10 -07:00
Romain Guy
6c07daf86c Fix native crash in SkiaShader. 
Bug #2893733

Change-Id: I7feb9ab113fe0012cf9eb271f2b044f12a5c9c4e
 2010-08-04 15:35:18 -07:00
Irfan Sheriff
1cf56ab9c6 Avoid hostname lookup in NetworkProperties 
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
 2010-08-04 15:15:49 -07:00
Alex Sakhartchouk
f61f33dd38 Merge "Added ability to set font color. Propagating the name of meshes and allocations from native a3d to java" 2010-08-04 14:48:26 -07:00
Alex Sakhartchouk
fb10c16a05 Added ability to set font color. 
Propagating the name of meshes and allocations from native a3d to java

Change-Id: If781f55340b5369459610e5e92ea69e240dcd24e
 2010-08-04 14:45:48 -07:00
Nipun Kwatra
a8bd3a303e Merge "Adding parseSizesList, getSupportedPreviewSizes to CameraParameters." 2010-08-04 14:23:54 -07:00
Andreas Huber
ac8e7060e0 am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 
Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp

* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
  Don't return a decoder error if the encoded stream does not start with SPS/PPS.
 2010-08-04 14:18:58 -07:00
Andreas Huber
86d2c088f1 Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 2010-08-04 14:16:20 -07:00
Andreas Huber
1f513d8821 am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp

* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
 2010-08-04 14:15:23 -07:00
Kenny Root
1cd6340a72 am 50871525: Add more debugging to installd 
Merge commit '508715259c332613240b2399c77d35ea7214f91a' into gingerbread-plus-aosp

* commit '508715259c332613240b2399c77d35ea7214f91a':
  Add more debugging to installd
 2010-08-04 14:12:52 -07:00
Andreas Huber
1564455518 Don't return a decoder error if the encoded stream does not start with SPS/PPS. 
Change-Id: I960ada0c53f8ffe413ecd07c2c754a996841f592
 2010-08-04 14:08:14 -07:00
Brad Fitzpatrick
85d21bc6e1 am 9ee17b7d: am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread 
Merge commit '9ee17b7dec7c76830b5add29f3b97039e178629a'

* commit '9ee17b7dec7c76830b5add29f3b97039e178629a':
  Usage Stats: don't block writing stats to disk.
 2010-08-04 14:07:55 -07:00
Andreas Huber
c17f35dd92 Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 2010-08-04 14:06:12 -07:00
Nipun Kwatra
b70c1db70f Adding parseSizesList, getSupportedPreviewSizes to CameraParameters. 
Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.

Change-Id: I435317427c1ee9623caef435f93e95d4476b7285
 2010-08-04 14:04:07 -07:00
Chet Haase
bb688d6f37 Merge "Fix NPE in onAnimationEnd when using Sequencer.after(long)" 2010-08-04 13:58:52 -07:00
Patrick Dubroy
40771bc433 Fix NPE in onAnimationEnd when using Sequencer.after(long) 2010-08-04 13:49:39 -07:00
Jeff Hamilton
397e3a7bf7 Merge "Improve the documentation for the browser provider, and a few small cleanups." 2010-08-04 13:44:17 -07:00
Scott Main
53adc3c296 Merge "add droiddoc flag for honeycomb apis (for reference filtering)" 2010-08-04 13:35:39 -07:00
Vasu Nori
0c9e14aa4a add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown 
Change-Id: I3dd69b6907d68b7c1184139f22297ab92337f043
 2010-08-04 13:34:34 -07:00
Jeff Hamilton
31d95db2cc Improve the documentation for the browser provider, and a few small cleanups. 
Change-Id: If6eb918ce4cdb09f74bd7eaaedf265d7981365ee
 2010-08-04 15:26:25 -05:00