Commit Graph

11545 Commits

Author SHA1 Message Date
Android (Google) Code Review
fc3cad0e4e Merge change I8385f59d into eclair
* changes:
  sdk doc change for esr: Cleanup for resources tab content.
2009-12-15 21:24:15 -08:00
Android (Google) Code Review
b649e089a2 Merge change Ie417158c
* changes:
  fix [2330211] sensors thread priority too low
2009-12-15 19:32:58 -08:00
Leon Scroggins
626d0d49a3 am 62daa729: am aacced6b: Provide localized strings for <input> labels.
Merge commit '62daa7298bd26da37227b3a48ed86854e3643d6c'

* commit '62daa7298bd26da37227b3a48ed86854e3643d6c':
  Provide localized strings for <input> labels.
2009-12-15 16:10:25 -08:00
Fred Quintana
2442fd0cc9 resolved conflicts for merge of 5a374f94 to master 2009-12-15 15:57:33 -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
Dave Sparks
f9bbbb343d am b5fc8ffc: am 91487425: Merge change I0448ef20 into eclair
Merge commit 'b5fc8ffcff6b8e1747af5c6ba1176a81986b55a8'

* commit 'b5fc8ffcff6b8e1747af5c6ba1176a81986b55a8':
  Fix SoundPool buffer size rounding error. Bug 2327620.
2009-12-15 15:05:37 -08:00
Trevor Johns
6a998cf2e6 am 3a0d1a46: am 311bb7fc: Merge change I0c8814d1 into eclair
Merge commit '3a0d1a46294eb182a66bef69f4037a9b40820e2c'

* commit '3a0d1a46294eb182a66bef69f4037a9b40820e2c':
  Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
2009-12-15 15:04:28 -08:00
Eric Fischer
0c55c788d5 am 7bbb1999: am 72521860: Merge change I8f657a99 into eclair
Merge commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa'

* commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa':
  Avoid a crash trying to get a substring whose start is after its end.
2009-12-15 15:04:18 -08:00
Trevor Johns
7ff66933c9 am a7cd86f9: am 7c0f00cc: Adding list of articles to docs/html/resources/articles/index.jd.
Merge commit 'a7cd86f9ef220be04eb020f9de3fefaf741b791c'

* commit 'a7cd86f9ef220be04eb020f9de3fefaf741b791c':
  Adding list of articles to docs/html/resources/articles/index.jd.
2009-12-15 15:04:09 -08:00
Dirk Dougherty
c3e9783256 am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair
Merge commit '479a49f74f77855825ba69b105c065422c24246a'

* commit '479a49f74f77855825ba69b105c065422c24246a':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
2009-12-15 15:04:00 -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
Android (Google) Code Review
ae751243aa Merge change I7e5ab3b1
* changes:
  Continue es2 shader dev
2009-12-15 13:33:24 -08:00
Android (Google) Code Review
600cca841c Merge change I98cb3b5c
* changes:
  Fixes the IME not triggering on touch bug.
2009-12-15 13:31:32 -08:00
Android (Google) Code Review
8dc306d3c5 Merge change I0011bcf5
* changes:
  Continue development of es2.0 user shader support for renderscript.  This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info.
2009-12-15 13:00:25 -08:00
Android (Google) Code Review
0cad320a61 Merge change I611cd3f4
* changes:
  Fixes layout shifts in LinearLayout.
2009-12-15 12:14:19 -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
Android (Google) Code Review
6bb6ac4105 Merge change I620f67c8
* changes:
  Cherry-picking change I476e5a00 from eclair-china
2009-12-15 10:45:07 -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
Dave Sparks
498aaa941c am 91487425: Merge change I0448ef20 into eclair
Merge commit '9148742546defc66a23ca1a0fc8f5515ff2c6c61' into eclair-plus-aosp

* commit '9148742546defc66a23ca1a0fc8f5515ff2c6c61':
  Fix SoundPool buffer size rounding error. Bug 2327620.
2009-12-15 08:57:24 -08:00
Android (Google) Code Review
ccb6b93540 Merge change I0448ef20 into eclair
* changes:
  Fix SoundPool buffer size rounding error. Bug 2327620.
2009-12-15 08:50:20 -08:00
Trevor Johns
289a1327a7 am 311bb7fc: Merge change I0c8814d1 into eclair
Merge commit '311bb7fcc145115675adc7e5f1567dce479d4899' into eclair-plus-aosp

* commit '311bb7fcc145115675adc7e5f1567dce479d4899':
  Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
2009-12-15 07:42:59 -08:00
Eric Fischer
32399e3221 am 72521860: Merge change I8f657a99 into eclair
Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp

* commit '725218602e8505cd6fe3075253fcb792727e2431':
  Avoid a crash trying to get a substring whose start is after its end.
2009-12-15 07:42:03 -08:00
Trevor Johns
bd9d67a376 am 7c0f00cc: Adding list of articles to docs/html/resources/articles/index.jd.
Merge commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48' into eclair-plus-aosp

* commit '7c0f00ccddc96cc6b30e8aa53c5219543523cf48':
  Adding list of articles to docs/html/resources/articles/index.jd.
2009-12-15 07:40:52 -08:00
Dirk Dougherty
545125a490 am 7585586c: Merge change Ib1eb2e9e into eclair
Merge commit '7585586ce5b5de699b95125672e29eaf70876727' into eclair-plus-aosp

* commit '7585586ce5b5de699b95125672e29eaf70876727':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
2009-12-15 07:40:02 -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
Android Git Automerger
58a6127b07 Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:44:42 -08:00
Android (Google) Code Review
999e84618d Merge change I0c8814d1 into eclair
* changes:
  Removing copyrighted backgrounds/logos from ContactManager and Wiktionary samples.
2009-12-14 21:34:44 -08:00
Android (Google) Code Review
2f41ab2165 Merge change I11fbdf50
* changes:
  Remove check for surface valid that is no longer valid.
2009-12-14 19:21:28 -08:00
Android (Google) Code Review
418d032c1e Merge change I236092a3
* changes:
  Fixes crash in HierarchyViewer when windows hash code exceed int capacity. Bug: 2321018
2009-12-14 17:57:43 -08:00
Android (Google) Code Review
8531e0d6d9 Merge change I8f657a99 into eclair
* changes:
  Avoid a crash trying to get a substring whose start is after its end.
2009-12-14 17:41:15 -08:00
Kenny Root
b092558fce am 451c850f: am 15f1bfb0: Merge change I70d0bddb into eclair-mr2
Merge commit '451c850fd60aca5372810a5413636fda25d93438'

* commit '451c850fd60aca5372810a5413636fda25d93438':
  Revise aapt options for UTF8/16 encoding
2009-12-14 16:32:08 -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
4c5a9631d8 am 83652ebf: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2
Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'

* commit '83652ebfe1963bcecdcf24383165904223baca6e':
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:15:03 -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
59fb3ee3bd am 08e2106a: am 67f1db1c: Merge change Ib1f5ee41 into eclair-mr2
Merge commit '08e2106a19a034670287374d96d671495e4ffc5f'

* commit '08e2106a19a034670287374d96d671495e4ffc5f':
  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:59:05 -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
ddb5d2b972 am b6ffc8f2: am 16396414: Merge change If5b0b6fa into eclair-mr2
Merge commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1'

* commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1':
  Fixed class paths in layout xml files
2009-12-14 15:35:19 -08:00
Andreas Huber
0431e6288c am dc7294d9: am 19553241: Merge change I1314e737 into eclair-mr2
Merge commit 'dc7294d94dba213727c1956774466707e58a8784'

* commit 'dc7294d94dba213727c1956774466707e58a8784':
  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:35:07 -08:00
Andreas Huber
2f262982ab am 354cf967: am 0483f1c1: Merge change Ib5ae1c87 into eclair-mr2
Merge commit '354cf96792196ce0fec358a573d2621ad2ab0788'

* commit '354cf96792196ce0fec358a573d2621ad2ab0788':
  The software AVCDecoder now properly seeks as requested.
2009-12-14 15:34:55 -08:00
Dianne Hackborn
031a943e62 am 48e1bd45: am 91afce93: am 9602d9ad: Fix issue #2325782 Missing location features
Merge commit '48e1bd45e2e4d1dda075aad26aea9ea16a597d49'

* commit '48e1bd45e2e4d1dda075aad26aea9ea16a597d49':
  Fix issue #2325782 Missing location features
2009-12-14 15:34:39 -08:00