Commit Graph

8950 Commits

Author SHA1 Message Date
Tom Taylor
689697be59 am d4a4729c: Update imports to android-common
Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp

* commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0':
  Update imports to android-common
2009-12-21 15:44:34 -08:00
Tom Taylor
6bbc151060 am 6a188713: Merge change I37f5ced1 into eclair-mr2
Merge commit '6a18871355f22bd0f91192e91345f48dff91f71a' into eclair-mr2-plus-aosp

* commit '6a18871355f22bd0f91192e91345f48dff91f71a':
  Move various utility classes to android-common
2009-12-21 11:26:32 -08:00
Android (Google) Code Review
a508091007 Merge change I37f5ced1 into eclair-mr2
* changes:
  Move various utility classes to android-common
2009-12-21 09:59:25 -08:00
Grace Kloba
e679046745 am 9a67c820: Address the multiple resizing during initializing problem adobe run into.
Merge commit '9a67c82089e43d37f5038c74b0e1dca8edc4ac8a' into eclair-mr2-plus-aosp

* commit '9a67c82089e43d37f5038c74b0e1dca8edc4ac8a':
  Address the multiple resizing during initializing
2009-12-20 11:34:57 -08:00
James Dong
15611480e3 am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc
Merge commit '4d0e827d0be6085893428b420ec5800f1973a43b' into eclair-mr2-plus-aosp

* commit '4d0e827d0be6085893428b420ec5800f1973a43b':
  Attempt to fix simular build break.
2009-12-19 09:00:17 -08:00
James Dong
74f5930e62 am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
Merge commit '4e4795c8c0934eb063048471037ecb8a713e85fd' into eclair-mr2-plus-aosp

* commit '4e4795c8c0934eb063048471037ecb8a713e85fd':
  Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
2009-12-19 08:26:03 -08:00
Jim Miller
288fa08d80 am 05de7c88: Merge change I420cc110 into eclair-mr2
Merge commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9' into eclair-mr2-plus-aosp

* commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9':
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
2009-12-18 16:10:31 -08:00
Android (Google) Code Review
bd1865f659 Merge change I420cc110 into eclair-mr2
* changes:
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
2009-12-18 16:07:19 -08:00
Robert Greenwalt
82f10dff2d am 421c72b6: Cleanup of process-specific DNS.
Merge commit '421c72b6773582dd1473ace44c42d4e0ee1287e3' into eclair-mr2-plus-aosp

* commit '421c72b6773582dd1473ace44c42d4e0ee1287e3':
  Cleanup of process-specific DNS.
2009-12-18 14:33:55 -08:00
Gloria Wang
35e7f03d54 am 791c626a: Merge change Ibac388a3 into eclair-mr2
Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp

* commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233':
  Add support for XING header
2009-12-18 10:34:18 -08:00
Android (Google) Code Review
79720249c9 Merge change Ibac388a3 into eclair-mr2
* changes:
  Add support for XING header
2009-12-18 10:30:37 -08:00
Tom Taylor
466d65e3c1 Move various utility classes to android-common
In the process of making Mms unbundled, copy a few non-public-API
classes into the android-common library. The Mms app now uses this
library. The next step is to update the other apps that use these classes
and then delete the classes from their original location.
2009-12-18 10:08:35 -08:00
Mike Reed
6ce158472e am 6888f559: Merge change If0c93a57 into eclair-mr2
Merge commit '6888f559ba215abd210df749c3ef63706d0bc56a' into eclair-mr2-plus-aosp

* commit '6888f559ba215abd210df749c3ef63706d0bc56a':
  add DragTracker class
2009-12-18 09:53:26 -08:00
Android (Google) Code Review
7dab0912cb Merge change If0c93a57 into eclair-mr2
* changes:
  add DragTracker class
2009-12-18 09:50:57 -08:00
James Dong
384ba171e9 am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '02f5b5447de349216a40086ca6061efefb5a3025' into eclair-mr2-plus-aosp

* commit '02f5b5447de349216a40086ca6061efefb5a3025':
  Initial checkins of the mpeg4 and h263 software decoders based on PV
2009-12-17 13:30:55 -08:00
Fred Quintana
86e376908a am 66cc5900: Merge change Ic70239e8 into eclair-mr2
Merge commit '66cc5900a53b22326bce053973730a301732efe9' into eclair-mr2-plus-aosp

* commit '66cc5900a53b22326bce053973730a301732efe9':
  changed SettingsProvider to manage the androidid itself
2009-12-17 12:21:25 -08:00
Android (Google) Code Review
02a5abc362 Merge change Ic70239e8 into eclair-mr2
* changes:
  changed SettingsProvider to manage the androidid itself
2009-12-17 12:19:46 -08:00
Jeff Hamilton
c59fde9dcb am 4986934e: Merge change Ia6446890 into eclair-mr2
Merge commit '4986934e189032dba43676973038879b5f90a406' into eclair-mr2-plus-aosp

* commit '4986934e189032dba43676973038879b5f90a406':
  Remove the IM provider contract class.
2009-12-17 11:53:25 -08:00
Android (Google) Code Review
e267a91c68 Merge change Ia6446890 into eclair-mr2
* changes:
  Remove the IM provider contract class.
2009-12-17 11:49:50 -08:00
Andreas Huber
81969be457 am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp

* commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d':
  Squashed commit of the following:
2009-12-17 10:23:46 -08:00
Android (Google) Code Review
5ada1a677d Merge change I895fb7d7 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-12-17 10:21:31 -08:00
Mike Reed
bb7fb4603f am 31a69fdb: throw if we have a null typeface native instance (so we don\'t crash in native code) we may still have to native-destroy a Typeface with a null ref, so check for that
Merge commit '31a69fdbe1edd8d686043e8ca7d278289f65808e' into eclair-mr2-plus-aosp

* commit '31a69fdbe1edd8d686043e8ca7d278289f65808e':
  throw if we have a null typeface native instance (so we don't crash in native code)
2009-12-17 09:24:18 -08:00
Yang Li
7cb3586958 am e96b6838: Merge change I4758f121 into eclair-mr2
Merge commit 'e96b6838b5a7ec3b4368e2449af9fbf0a8b75f16' into eclair-mr2-plus-aosp

* commit 'e96b6838b5a7ec3b4368e2449af9fbf0a8b75f16':
  Added the Protractor algorithm for calculating the minimum cosine distance between gestures
2009-12-16 21:42:21 -08:00
Android (Google) Code Review
ec262b63b9 Merge change I4758f121 into eclair-mr2
* changes:
  Added the Protractor algorithm for calculating the minimum cosine distance between gestures
2009-12-16 21:40:30 -08:00
Lixin Yue
ec4d26427c am 492604e9: Merge change I69f72c00 into eclair-mr2
Merge commit '492604e95239c1427dd5acb9109eb8acaaafc50d' into eclair-mr2-plus-aosp

* commit '492604e95239c1427dd5acb9109eb8acaaafc50d':
  Update OBEX lib setPath Flags handling logic to be compatible with spec.
2009-12-16 17:39:18 -08:00
Android (Google) Code Review
334da5cbaf Merge change I69f72c00 into eclair-mr2
* changes:
  Update OBEX lib setPath Flags handling logic to be compatible with spec.
2009-12-16 17:36:16 -08:00
Jaikumar Ganesh
39a10ee087 am 43ad522d: Merge change Ic0e32f12 into eclair-mr2
Merge commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3' into eclair-mr2-plus-aosp

* commit '43ad522d49dd3f89d7e367112fab64e4d5027bf3':
  Add a callback for the ConnectSink Call.
2009-12-16 16:27:14 -08:00
Android (Google) Code Review
82fb5a7139 Merge change Ic0e32f12 into eclair-mr2
* changes:
  Add a callback for the ConnectSink Call.
2009-12-16 16:22:17 -08:00
Grace Kloba
184f694c5c am 601112f2: Merge change I11438c37 into eclair-mr2
Merge commit '601112f213035851a2fa2c2281c7f56cf767b14a' into eclair-mr2-plus-aosp

* commit '601112f213035851a2fa2c2281c7f56cf767b14a':
  Implement the full screen WebView plugin.
2009-12-16 14:15:29 -08:00
Android (Google) Code Review
ae0f521ab1 Merge change I11438c37 into eclair-mr2
* changes:
  Implement the full screen WebView plugin.
2009-12-16 14:11:34 -08:00
Andreas Huber
6b109409a0 am d980e656: Merge change Ic7e91eee into eclair-mr2
Merge commit 'd980e656baa842592944c6fed371c9b37b2feea9' into eclair-mr2-plus-aosp

* commit 'd980e656baa842592944c6fed371c9b37b2feea9':
  Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
2009-12-15 15:38:40 -08:00
Android (Google) Code Review
3b6d732b93 Merge change Ic7e91eee into eclair-mr2
* changes:
  Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
2009-12-15 15:35:52 -08:00
Michael Chan
91b2faef49 am cdaeafd4: b/2224837 Changed the plumbing of how alerts/notifications work.
Merge commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c' into eclair-mr2-plus-aosp

* commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c':
  b/2224837 Changed the plumbing of how alerts/notifications work.
2009-12-15 15:27:31 -08:00
Andreas Huber
76cdbb927f am ae77561b: Merge change I7f11a67a into eclair-mr2
Merge commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a' into eclair-mr2-plus-aosp

* commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a':
  Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
2009-12-15 14:04:07 -08:00
Android (Google) Code Review
19b8aa8545 Merge change I7f11a67a into eclair-mr2
* changes:
  Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
2009-12-15 14:02:15 -08:00
Dmitri Plotnikov
8d956b29e1 am 3170f9a7: Fixing broken javadoc.
Merge commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc' into eclair-mr2-plus-aosp

* commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc':
  Fixing broken javadoc.
2009-12-15 13:58:28 -08:00
Dmitri Plotnikov
b315667fc9 am 07ab85b3: Introducing fields for capturing national specifics of contact names.
Merge commit '07ab85b338d6e08a901a13230ae4cedc57e418ea' into eclair-mr2-plus-aosp

* commit '07ab85b338d6e08a901a13230ae4cedc57e418ea':
  Introducing fields for capturing national specifics of contact names.
2009-12-15 12:01:46 -08:00
Cary Clark
1a798b2b60 am 1cb97eed: check to see if nav cache is up to date on tap
Merge commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c' into eclair-mr2-plus-aosp

* commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c':
  check to see if nav cache is up to date on tap
2009-12-15 10:45:38 -08:00
Ken Shirriff
2e064bb6f7 am 98d1803d: Merge change I11f66b41 into eclair-mr2
Merge commit '98d1803d4d00540695c63c0d52361e8e784d043e' into eclair-mr2-plus-aosp

* commit '98d1803d4d00540695c63c0d52361e8e784d043e':
  Remove unused SOURCE_ID constant.
2009-12-15 09:36:08 -08:00
Android (Google) Code Review
8340eb6644 Merge change I11f66b41 into eclair-mr2
* changes:
  Remove unused SOURCE_ID constant.
2009-12-15 09:33:17 -08:00
Leon Scroggins
79cebff55f am aacced6b: Provide localized strings for <input> labels.
Merge commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083' into eclair-mr2-plus-aosp

* commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083':
  Provide localized strings for <input> labels.
2009-12-15 05:56:11 -08:00
Fred Quintana
0e13738b08 am 274dc9d3: moved the hidden sync helpers out of the framework
Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp

* commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f':
  moved the hidden sync helpers out of the framework
2009-12-15 05:56:03 -08:00
Kenny Root
d884af6a8b am 15f1bfb0: Merge change I70d0bddb into eclair-mr2
Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp

* commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0':
  Revise aapt options for UTF8/16 encoding
2009-12-14 16:28:03 -08:00
Android (Google) Code Review
e6459adb75 Merge change I70d0bddb into eclair-mr2
* changes:
  Revise aapt options for UTF8/16 encoding
2009-12-14 16:24:32 -08:00
Dianne Hackborn
a3c15ab7e3 am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp

* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:10:13 -08:00
Android (Google) Code Review
38d0f0c05f Merge change Iaf1f0918 into eclair-mr2
* changes:
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:06:49 -08:00
Andreas Huber
7762a6ef4a am 67f1db1c: Merge change Ib1f5ee41 into eclair-mr2
Merge commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85' into eclair-mr2-plus-aosp

* commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85':
  It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
2009-12-14 15:54:19 -08:00
Android (Google) Code Review
7c76a149cd Merge change Ib1f5ee41 into eclair-mr2
* changes:
  It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
2009-12-14 15:48:48 -08:00
Paul Westbrook
290e02b049 am 16396414: Merge change If5b0b6fa into eclair-mr2
Merge commit '163964143fe27b7fdbeb51a4fc65d72769c83481' into eclair-mr2-plus-aosp

* commit '163964143fe27b7fdbeb51a4fc65d72769c83481':
  Fixed class paths in layout xml files
2009-12-14 15:29:46 -08:00
Andreas Huber
c77a6c7f4a am 19553241: Merge change I1314e737 into eclair-mr2
Merge commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc' into eclair-mr2-plus-aosp

* commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc':
  AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
2009-12-14 15:27:01 -08:00