Scott Main
1e5710ce6f
am 73536dda: am d92cc9a4: Merge change I33eb64c0 into eclair
...
Merge commit '73536dda20594e4b5e83396d705127a823bfa362'
* commit '73536dda20594e4b5e83396d705127a823bfa362':
docs: add 2.1 platform notes, win usb driver notes
2009-12-16 11:20:22 -08:00
Scott Main
73536dda20
am d92cc9a4: Merge change I33eb64c0 into eclair
...
Merge commit 'd92cc9a4ba2cf38f133cc2b51fe1cd0be8659db9' into eclair-plus-aosp
* commit 'd92cc9a4ba2cf38f133cc2b51fe1cd0be8659db9':
docs: add 2.1 platform notes, win usb driver notes
2009-12-16 11:17:54 -08:00
Android (Google) Code Review
71939987a8
Merge change I5dad8b4d
...
* changes:
Place shader logging behind prop to declutter logs.
2009-12-16 11:12:16 -08:00
Scott Main
81e886aa3d
am eab4fe7a: am 4c4a47f4: docs: add developer dashboard page and add topic link to it from the homepage (replacing the video topic)
...
Merge commit 'eab4fe7a425532717bfc948430de73637ed81c84'
* commit 'eab4fe7a425532717bfc948430de73637ed81c84':
docs: add developer dashboard page and add topic link
2009-12-16 11:11:35 -08:00
Android (Google) Code Review
d92cc9a4ba
Merge change I33eb64c0 into eclair
...
* changes:
docs: add 2.1 platform notes, win usb driver notes and fix some javadocs for PhonestateListener
2009-12-16 11:11:02 -08:00
Scott Main
c49f864695
resolved conflicts for merge of aaf8a9d8 to master
2009-12-16 11:08:26 -08:00
Katarina Stenstedt
b5362167ab
am f0165495: am 9d2252db: Merge change Ia36d8e74 into eclair
...
Merge commit 'f0165495951e3a32aa5697ac1299307c2d72f32a'
* commit 'f0165495951e3a32aa5697ac1299307c2d72f32a':
Updates to SDK troubleshooting doc, per bug 2315781.
2009-12-16 10:32:29 -08:00
Dirk Dougherty
c0d7e1ccda
am 4a2d630f: am 6ccc515c: Merge change I8385f59d into eclair
...
Merge commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2'
* commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2':
sdk doc change for esr: Cleanup for resources tab content.
2009-12-16 10:32:20 -08:00
Scott Main
eab4fe7a42
am 4c4a47f4: docs: add developer dashboard page and add topic link to it from the homepage (replacing the video topic)
...
Merge commit '4c4a47f42101a57ab8ff05a8e035d97582c3368a' into eclair-plus-aosp
* commit '4c4a47f42101a57ab8ff05a8e035d97582c3368a':
docs: add developer dashboard page and add topic link
2009-12-16 10:28:16 -08:00
Scott Main
aaf8a9d885
am 218c0763: Merge change Ib43ec8f6 into eclair
...
Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp
* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
docs: fix some typos in the manifest docs samples and
2009-12-16 10:28:11 -08:00
Katarina Stenstedt
f016549595
am 9d2252db: Merge change Ia36d8e74 into eclair
...
Merge commit '9d2252db2cd82535f475fc3823e6e7c60cf17038' into eclair-plus-aosp
* commit '9d2252db2cd82535f475fc3823e6e7c60cf17038':
Updates to SDK troubleshooting doc, per bug 2315781.
2009-12-16 10:28:06 -08:00
Dirk Dougherty
4a2d630f68
am 6ccc515c: Merge change I8385f59d into eclair
...
Merge commit '6ccc515c7f705a66718d0138a421e29186667b9e' into eclair-plus-aosp
* commit '6ccc515c7f705a66718d0138a421e29186667b9e':
sdk doc change for esr: Cleanup for resources tab content.
2009-12-16 10:27:47 -08:00
Scott Main
4c4a47f421
docs: add developer dashboard page and add topic link
...
to it from the homepage (replacing the video topic)
2009-12-16 10:08:32 -08:00
Android (Google) Code Review
218c0763d5
Merge change Ib43ec8f6 into eclair
...
* changes:
docs: fix some typos in the manifest docs samples and remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.
2009-12-16 10:05:10 -08:00
Android (Google) Code Review
9d2252db2c
Merge change Ia36d8e74 into eclair
...
* changes:
Updates to SDK troubleshooting doc, per bug 2315781.
2009-12-16 09:59:12 -08:00
Scott Main
b149ee8835
docs: add 2.1 platform notes, win usb driver notes
...
and fix some javadocs for PhonestateListener
2009-12-16 09:50:53 -08:00
Andreas Huber
cef27ee7dc
am d9344791: am d980e656: Merge change Ic7e91eee into eclair-mr2
...
Merge commit 'd93447910055565726836a1cdcfc3bad7c95f98c'
* commit 'd93447910055565726836a1cdcfc3bad7c95f98c':
Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
2009-12-16 08:59:31 -08:00
Michael Chan
3448bc6fdd
am aab60116: am cdaeafd4: b/2224837 Changed the plumbing of how alerts/notifications work.
...
Merge commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa'
* commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa':
b/2224837 Changed the plumbing of how alerts/notifications work.
2009-12-16 08:59:12 -08:00
Andreas Huber
3d4c89cce1
am e065696c: am ae77561b: Merge change I7f11a67a into eclair-mr2
...
Merge commit 'e065696cd93a454877b44de9b96a033a7553b5ff'
* commit 'e065696cd93a454877b44de9b96a033a7553b5ff':
Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
2009-12-16 08:58:57 -08:00
Dmitri Plotnikov
4407162848
am f2608793: am 3170f9a7: Fixing broken javadoc.
...
Merge commit 'f260879397f557b17157c73bb61b7ec09239bf10'
* commit 'f260879397f557b17157c73bb61b7ec09239bf10':
Fixing broken javadoc.
2009-12-16 08:58:49 -08:00
Dmitri Plotnikov
2531d6721d
resolved conflicts for merge of c95b39d3 to master
...
Change-Id: I42b2fcaf09d289b88fba4eda7f2e3355ea7183fb
2009-12-16 08:56:19 -08:00
Cary Clark
20a9a57a18
am e9db8335: am 1cb97eed: check to see if nav cache is up to date on tap
...
Merge commit 'e9db8335c01aa47799403b59718811ec703cfe61'
* commit 'e9db8335c01aa47799403b59718811ec703cfe61':
check to see if nav cache is up to date on tap
2009-12-16 08:07:09 -08:00
Ken Shirriff
cf2a59de63
am 72e06096: am 98d1803d: Merge change I11f66b41 into eclair-mr2
...
Merge commit '72e060967e045da99cc68df5bcc7d3ec9529658d'
* commit '72e060967e045da99cc68df5bcc7d3ec9529658d':
Remove unused SOURCE_ID constant.
2009-12-16 08:06:18 -08:00
Android (Google) Code Review
6ccc515c7f
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
c935832ca6
Merge change Ie417158c
...
* changes:
fix [2330211] sensors thread priority too low
2009-12-15 19:32:58 -08:00
Dirk Dougherty
50bfb39c55
sdk doc change for esr: Cleanup for resources tab content.
...
Bug:2160782
Change-Id: I8385f59d764156ccc318f71e5d344c7f33330c40
2009-12-15 19:24:58 -08:00
Jason Sams
5dad8b4d1f
Place shader logging behind prop to declutter logs.
2009-12-15 19:10:11 -08:00
Mathias Agopian
e417158c06
fix [2330211] sensors thread priority too low
...
bump the sensor thread priority to URGENT_DISPLAY. Events will be enqueued
in the UI (or other user provided) thread, which runs at DISPLAY prio.
2009-12-15 17:37:46 -08:00
Dmitri Plotnikov
d1168af4fa
Cherry-picking c95b39d3 from eclair-mr2
...
Change-Id: Ib8aaefdde96422ab7b54e10e0e9328bba10e305f
2009-12-15 16:42:47 -08:00
Leon Scroggins
273ee3c763
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
2c5634198a
resolved conflicts for merge of 5a374f94 to master
2009-12-15 15:57:33 -08:00
Andreas Huber
d934479100
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
d980e656ba
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
aab601168c
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
Michael Chan
cdaeafd440
b/2224837 Changed the plumbing of how alerts/notifications work.
...
Instead of processing each notification separately event (scheduling an alarm with AlarmManager for each event, posting notification to NotificationManager for each event, etc), only one alarm should be fired for each wake-up time. AlertService will look through the CalendarAlerts table and decides how to update the notication manager. This is more efficient and simplifies the codecode. It is also the long-term fix to elimiate overlapping notification ring tones e.g. DrooDrooDrooooid b/2194249
Also consolidated alarm scheduling code to one place.
Change-Id: If58ce278d55b28abad703f8aeee466d44952fcd0
2009-12-15 15:24:34 -08:00
Andreas Huber
c7e91eee2e
Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
2009-12-15 15:22:08 -08:00
Dave Sparks
c333133107
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
d3f237a538
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
7b4787b737
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
53887d4fde
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
692bf86e67
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
Paul Westbrook
01dde47ea9
Bug 2326468
...
Deleted old copy of the GoogleHttpClient, and the unit tests.
2009-12-15 14:26:13 -08:00
Andreas Huber
e065696cd9
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
ae77561b8f
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
f260879397
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
3170f9a7cf
Fixing broken javadoc.
...
Change-Id: Ic5206054281919888943d036d9f6772ea2e63c5b
2009-12-15 13:54:28 -08:00
Android (Google) Code Review
d6542507e7
Merge change I7e5ab3b1
...
* changes:
Continue es2 shader dev
2009-12-15 13:33:24 -08:00
Android (Google) Code Review
1890be79cf
Merge change I98cb3b5c
...
* changes:
Fixes the IME not triggering on touch bug.
2009-12-15 13:31:32 -08:00
Andreas Huber
fb1c2f8d8d
Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
2009-12-15 13:28:55 -08:00
Jason Sams
7e5ab3b177
Continue es2 shader dev
...
Conflicts:
graphics/java/android/renderscript/Program.java
graphics/java/android/renderscript/ProgramVertex.java
2009-12-15 13:27:04 -08:00