ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
11,573 Commits 2 Branches 0 Tags 54 MiB
b46c807d43
Commit Graph

11573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
db28572830 Merge change I987dbde8 
* changes:
  Fix full stagefright build in master, various warnings/errors in omx_jpeg_decoder
 2009-12-16 13:25:16 -08:00
Xavier Ducrohet
78d4d5237a am b43b35a0: am e6547423: Merge change I10073d50 into eclair 
Merge commit 'b43b35a034ad667ba749270537155e7534906153'

* commit 'b43b35a034ad667ba749270537155e7534906153':
  Add Annotation for optional features.
 2009-12-16 12:19:52 -08:00
Xavier Ducrohet
8bf08a636c am e6547423: Merge change I10073d50 into eclair 
Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp

* commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3':
  Add Annotation for optional features.
 2009-12-16 12:16:24 -08:00
Android (Google) Code Review
39cb8b4cc2 Merge change I10073d50 into eclair 
* changes:
  Add Annotation for optional features.
 2009-12-16 12:14:11 -08:00
Scott Main
ce6b7291fb am 18a27886: am 8bda0fb0: Merge change Iccb92649 into eclair 
Merge commit '18a27886952ba7fb78174508c5348959b31a73ef'

* commit '18a27886952ba7fb78174508c5348959b31a73ef':
  docs: fix typo
 2009-12-16 11:20:30 -08:00
Scott Main
2c8b3891aa 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
23cc0908a8 am 8bda0fb0: Merge change Iccb92649 into eclair 
Merge commit '8bda0fb0ca24875ad6084f35250f166b45f967a1' into eclair-plus-aosp

* commit '8bda0fb0ca24875ad6084f35250f166b45f967a1':
  docs: fix typo
 2009-12-16 11:18:00 -08:00
Scott Main
e0a5e93f7a 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
bba805c780 Merge change Iccb92649 into eclair 
* changes:
  docs: fix typo
 2009-12-16 11:14:40 -08:00
Android (Google) Code Review
40385fab67 Merge change I5dad8b4d 
* changes:
  Place shader logging behind prop to declutter logs.
 2009-12-16 11:12:16 -08:00
Scott Main
aa1450c93c 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
3cd2d9060d 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
d52bd177da resolved conflicts for merge of aaf8a9d8 to master 2009-12-16 11:08:26 -08:00
Katarina Stenstedt
e3965ced30 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
e604052d25 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
79b9741b40 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
808361f521 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
fa65f1a730 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
aa7b4f9d3f 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
Android (Google) Code Review
9e50d7c719 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
be9952f8b3 Merge change Ia36d8e74 into eclair 
* changes:
  Updates to SDK troubleshooting doc, per bug 2315781.
 2009-12-16 09:59:12 -08:00
Andreas Huber
cbe41ce95b 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
282c85aa37 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
1ba58e77e2 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
c89a484add 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
1cee85eee8 resolved conflicts for merge of c95b39d3 to master 
Change-Id: I42b2fcaf09d289b88fba4eda7f2e3355ea7183fb
 2009-12-16 08:56:19 -08:00
Cary Clark
3e1ccec477 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
df72cb34f6 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
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