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
f631e832e1
am 0249c83e: 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 '0249c83ed014cc6a36caac30e55db62c29c204e2'
* commit '0249c83ed014cc6a36caac30e55db62c29c204e2':
throw if we have a null typeface native instance (so we don't crash in native code)
2009-12-17 09:27:42 -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
Scott Main
5aee0cfd98
am aaab0b64: am f0cdfa99: add -since flag to droiddoc options for 7.xml, to apply api filtering to the reference
...
Merge commit 'aaab0b64e53db6e174236b022526a5f207b28570'
* commit 'aaab0b64e53db6e174236b022526a5f207b28570':
add -since flag to droiddoc options for 7.xml,
2009-12-16 21:53:28 -08:00
Scott Main
01ad30d34b
am f0cdfa99: add -since flag to droiddoc options for 7.xml, to apply api filtering to the reference
...
Merge commit 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1' into eclair-plus-aosp
* commit 'f0cdfa9955725c99cd4df6b933e4cb732847ebd1':
add -since flag to droiddoc options for 7.xml,
2009-12-16 21:50:36 -08:00
Yang Li
f713cb0398
am c57930aa: am e96b6838: Merge change I4758f121 into eclair-mr2
...
Merge commit 'c57930aa679385b87852a9805b971a4fb91c65be'
* commit 'c57930aa679385b87852a9805b971a4fb91c65be':
Added the Protractor algorithm for calculating the minimum cosine distance between gestures
2009-12-16 21:45:41 -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
Scott Main
18744ff6d2
am e46b2853: am 26099cd9: Merge change I7d67e1b3 into eclair
...
Merge commit 'e46b2853deff2dde83d20616b6023984fdd6c19c'
* commit 'e46b2853deff2dde83d20616b6023984fdd6c19c':
docs: small edits
2009-12-16 18:25:39 -08:00
Scott Main
c5d99bf06e
am 26099cd9: Merge change I7d67e1b3 into eclair
...
Merge commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c' into eclair-plus-aosp
* commit '26099cd9ce44ef26ab3c9b342ec1a305c61b7a7c':
docs: small edits
2009-12-16 18:22:44 -08:00
Android (Google) Code Review
58a671247f
Merge change I7d67e1b3 into eclair
...
* changes:
docs: small edits
2009-12-16 18:20:05 -08:00
Lixin Yue
eef31c5724
am 8fb44ae8: am 492604e9: Merge change I69f72c00 into eclair-mr2
...
Merge commit '8fb44ae8bb9401eb90e24bdf02482cf28d50ece9'
* commit '8fb44ae8bb9401eb90e24bdf02482cf28d50ece9':
Update OBEX lib setPath Flags handling logic to be compatible with spec.
2009-12-16 17:42:41 -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
19167aa13e
am 57043a67: am 43ad522d: Merge change Ic0e32f12 into eclair-mr2
...
Merge commit '57043a675f8826099e619c5d325fc7670be83e0b'
* commit '57043a675f8826099e619c5d325fc7670be83e0b':
Add a callback for the ConnectSink Call.
2009-12-16 16:31:25 -08:00
Grace Kloba
142d2feae9
am 4eb5f387: am 601112f2: Merge change I11438c37 into eclair-mr2
...
Merge commit '4eb5f38788e2b40339ab29cbfbae36e7741659c6'
* commit '4eb5f38788e2b40339ab29cbfbae36e7741659c6':
Implement the full screen WebView plugin.
2009-12-16 16:31:12 -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
1aa41233da
Merge change I64bf3d53
...
* changes:
Add FW log dump for bcm4329
2009-12-16 16:26:04 -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
Android (Google) Code Review
d0b149a20d
Merge change Ie3ab4d0f
...
* changes:
Restore live wallpapers if specified in the restore data
2009-12-16 16:01:58 -08:00
Android (Google) Code Review
7005184606
Merge change I8bb41dd6
...
* changes:
Add argument checking to sampler builder to disallow illegal modes.
2009-12-16 16:01:26 -08:00
Scott Main
4bd0aa1b9d
am 7ddb938c: am b2aab504: Merge change I354261e2 into eclair
...
Merge commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9'
* commit '7ddb938c6ca8490d9e0c61d35fafc5e9c62501d9':
docs: small edit to live wallpaper sentence
2009-12-16 15:52:32 -08:00
Trevor Johns
8c4627770b
am 50e72439: am 5ff60dff: Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
...
Merge commit '50e72439648dc36205ad307a07f3050270346308'
* commit '50e72439648dc36205ad307a07f3050270346308':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
2009-12-16 15:52:22 -08:00
Android (Google) Code Review
54776517c5
Merge change I7b7f29a3
...
* changes:
Fix live wallpaper many. Z coordinate was being ignored for draw quad call.
2009-12-16 15:36:43 -08:00
Scott Main
27c92f6303
am b2aab504: Merge change I354261e2 into eclair
...
Merge commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7' into eclair-plus-aosp
* commit 'b2aab5042b4f13ab58b04fef192f11522b0bf7a7':
docs: small edit to live wallpaper sentence
2009-12-16 15:32:22 -08:00
Trevor Johns
bb408a3268
am 5ff60dff: Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
...
Merge commit '5ff60dff181fc4982c822ef97e14a293af66a246' into eclair-plus-aosp
* commit '5ff60dff181fc4982c822ef97e14a293af66a246':
Updating frameworks/base/docs/html/shareables/latest_samples.zip to reflect current state of sample code as of 1d151678.
2009-12-16 15:32:16 -08:00
Android (Google) Code Review
41da2d613e
Merge change I354261e2 into eclair
...
* changes:
docs: small edit to live wallpaper sentence
2009-12-16 15:30:02 -08:00
Android (Google) Code Review
fd24b06cbc
Merge change I7fa1f88b
...
* changes:
Fix preloading after https://android-git.corp.google.com/g/35674 .
2009-12-16 14:29:39 -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
dbad5986bc
Merge change Ice9adcce
...
* changes:
Fix emulated glColor in es2 mode.
2009-12-16 14:13:54 -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
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