Commit Graph

11718 Commits

Author SHA1 Message Date
Jeff Hamilton
bc9c96c5ec resolved conflicts for merge of 08ace2e0 to master 2009-12-17 15:17:54 -06: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
Android (Google) Code Review
6fe2366add Merge change I17b7ffe9
* changes:
  Do not back up / restore the END_BUTTON_BEHAVIOR setting
2009-12-17 11:17:58 -08:00
Dirk Dougherty
2b91e370ee am fe3ad191: am 24780ea6: Merge change I75bb4c98 into eclair
Merge commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95'

* commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95':
  doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
2009-12-17 10:34:54 -08:00
Dirk Dougherty
eb21ecf7bc am 24780ea6: Merge change I75bb4c98 into eclair
Merge commit '24780ea60fab2c7fb399c88cd51151eccbbf383f' into eclair-plus-aosp

* commit '24780ea60fab2c7fb399c88cd51151eccbbf383f':
  doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
2009-12-17 10:33:23 -08:00
Dirk Dougherty
043a9e464a am 6fda019b: am 82e037a4: Merge change I3f67758f into eclair
Merge commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9'

* commit '6fda019bdcf9f9c172155aa2f2bb07afbe01fad9':
  doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
2009-12-17 10:33:16 -08:00
Android (Google) Code Review
9f64b89d8e Merge change I75bb4c98 into eclair
* changes:
  doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.
2009-12-17 10:31:19 -08:00
Dirk Dougherty
e8145f4fa3 am 82e037a4: Merge change I3f67758f into eclair
Merge commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f' into eclair-plus-aosp

* commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f':
  doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
2009-12-17 10:30:39 -08:00
Android (Google) Code Review
b8c3e4227d Merge change I3f67758f into eclair
* changes:
  doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
2009-12-17 10:28:06 -08:00
Andreas Huber
a888f83db6 am b5c6be6d: am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb'

* commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb':
  Squashed commit of the following:
2009-12-17 10:27:48 -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
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