Commit Graph

11542 Commits

Author SHA1 Message Date
Dianne Hackborn
016b83a252 am 47c38f00: am 558947c9: Issue #2335763: Cant dial emergency number on my device
Merge commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410'

* commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410':
  Issue #2335763: Cant dial emergency number on my device
2009-12-18 16:14:34 -08:00
Dianne Hackborn
0a8282b33c am 558947c9: Issue #2335763: Cant dial emergency number on my device
Merge commit '558947c9899627067d632e8a6365f77a35f433e1' into eclair-plus-aosp

* commit '558947c9899627067d632e8a6365f77a35f433e1':
  Issue #2335763: Cant dial emergency number on my device
2009-12-18 16:11:08 -08:00
Android (Google) Code Review
8ea7a99732 Merge change I3632fede
* changes:
  Bug 2330278
2009-12-18 15:31:49 -08:00
Robert Greenwalt
03f64b625e am 24317443: am 421c72b6: Cleanup of process-specific DNS.
Merge commit '24317443fde973c762afbea1a3f6f2c830dfe3dd'

* commit '24317443fde973c762afbea1a3f6f2c830dfe3dd':
  Cleanup of process-specific DNS.
2009-12-18 14:37:28 -08:00
Robert Greenwalt
82f10dff2d am 421c72b6: Cleanup of process-specific DNS.
Merge commit '421c72b6773582dd1473ace44c42d4e0ee1287e3' into eclair-mr2-plus-aosp

* commit '421c72b6773582dd1473ace44c42d4e0ee1287e3':
  Cleanup of process-specific DNS.
2009-12-18 14:33:55 -08:00
Android (Google) Code Review
f9e6c844e9 Merge change Ic854f281
* changes:
  Force a re-layout of children if ListView is out of sync with the adapter in onFocusChanged. Addresses bug 2157773
2009-12-18 12:14:05 -08:00
Android (Google) Code Review
efa6d5b2c8 Merge change I68afd01e
* changes:
  Move texture bindings to base program object.  Change ProgramFragment creation to require a texture format in 1.0 mode.
2009-12-18 12:01:34 -08:00
Gloria Wang
8c672b0037 am 254e0025: am 791c626a: Merge change Ibac388a3 into eclair-mr2
Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542'

* commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542':
  Add support for XING header
2009-12-18 10:37:42 -08:00
Gloria Wang
35e7f03d54 am 791c626a: Merge change Ibac388a3 into eclair-mr2
Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp

* commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233':
  Add support for XING header
2009-12-18 10:34:18 -08:00
Android (Google) Code Review
79720249c9 Merge change Ibac388a3 into eclair-mr2
* changes:
  Add support for XING header
2009-12-18 10:30:37 -08:00
Android (Google) Code Review
ea63fce6c6 Merge change I1d1ed967
* changes:
  Tap delays; making tap UI feel better. Addresses bug 2317577
2009-12-18 10:11:02 -08:00
Android (Google) Code Review
2cb612448c Merge change I89107c15
* changes:
  Updated test GridTouchVerticalSpacingStackFromBottomTest for larger screens. Addresses bug 2176089 http://b/issue?id=2176089 Now takes into account screen scaling.
2009-12-18 10:10:46 -08:00
Android (Google) Code Review
04572008d3 Merge change I58acbafc
* changes:
  Fix for http://b/issue?id=2323459 and generics correctness on a WeakReference
2009-12-18 10:10:28 -08:00
Mike Reed
70893acb87 am 750a64ac: am 6888f559: Merge change If0c93a57 into eclair-mr2
Merge commit '750a64aca07faf032f1e3ea40cee840d34be0d2c'

* commit '750a64aca07faf032f1e3ea40cee840d34be0d2c':
  add DragTracker class
2009-12-18 09:57:37 -08:00
James Dong
6ce1c33841 am 5614c2c6: am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '5614c2c677ce08561c93c6385dc3090dbf5760dc'

* commit '5614c2c677ce08561c93c6385dc3090dbf5760dc':
  Initial checkins of the mpeg4 and h263 software decoders based on PV
2009-12-18 09:57:22 -08:00
Mike Reed
6ce158472e am 6888f559: Merge change If0c93a57 into eclair-mr2
Merge commit '6888f559ba215abd210df749c3ef63706d0bc56a' into eclair-mr2-plus-aosp

* commit '6888f559ba215abd210df749c3ef63706d0bc56a':
  add DragTracker class
2009-12-18 09:53:26 -08:00
Android (Google) Code Review
7dab0912cb Merge change If0c93a57 into eclair-mr2
* changes:
  add DragTracker class
2009-12-18 09:50:57 -08:00
Android (Google) Code Review
cbc7399f77 Merge change I9c401646
* changes:
  Rework the LRU list for hidden and empty processes.
2009-12-17 18:12:26 -08:00
Dirk Dougherty
0e1b75b944 am 98a48f0f: am 5da76ddd: doc change: Add ?details query to doc about Android Market.
Merge commit '98a48f0fd3af5fec833dab44da17f8911e95d147'

* commit '98a48f0fd3af5fec833dab44da17f8911e95d147':
  doc change: Add ?details query to doc about Android Market.
2009-12-17 17:38:49 -08:00
Dirk Dougherty
7766e32b6d am 5da76ddd: doc change: Add ?details query to doc about Android Market.
Merge commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e' into eclair-plus-aosp

* commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e':
  doc change: Add ?details query to doc about Android Market.
2009-12-17 17:35:58 -08:00
Android (Google) Code Review
1bfd3c1766 Merge change I2278137e
* changes:
  Disable HTTP playback and metadata support in stagefright, use PV instead.
2009-12-17 14:26:37 -08:00
James Dong
384ba171e9 am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '02f5b5447de349216a40086ca6061efefb5a3025' into eclair-mr2-plus-aosp

* commit '02f5b5447de349216a40086ca6061efefb5a3025':
  Initial checkins of the mpeg4 and h263 software decoders based on PV
2009-12-17 13:30:55 -08:00
Android (Google) Code Review
f644c002bb Merge change I38e951b6
* changes:
  Write HierarchyViewer's data in UTF-8.
2009-12-17 13:30:11 -08:00
Fred Quintana
eb038db53a am bc1c8847: am 66cc5900: Merge change Ic70239e8 into eclair-mr2
Merge commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0'

* commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0':
  changed SettingsProvider to manage the androidid itself
2009-12-17 13:21:36 -08:00
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