4096 Commits

Author SHA1 Message Date
Mike Cleron
4b0ee97d67 am f45076dd: am fdf53a46: Merge change 26935 into eclair
Merge commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d'

* commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d':
  Fix bug 2129190
2009-09-25 11:22:49 -07:00
Nick Pelly
a0c1abcef6 am a7e508eb: am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Merge commit 'a7e508eb55c8f63ff43aea2374a2773893e69321'

* commit 'a7e508eb55c8f63ff43aea2374a2773893e69321':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.
2009-09-25 11:16:17 -07:00
Fred Quintana
120d132475 am 63344cae: am 91a00d3a: fix typo
Merge commit '63344cae94520d789dbe4002dcc3d6ef45d9a040'

* commit '63344cae94520d789dbe4002dcc3d6ef45d9a040':
  fix typo
2009-09-25 11:14:38 -07:00
Fred Quintana
e2f2df4041 am 5dfe9f15: am f5808415: rename misc to birthday
Merge commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff'

* commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff':
  rename misc to birthday
2009-09-25 11:14:31 -07:00
Daisuke Miyakawa
de6bbe7fc1 am 2f24ab9f: am 4579ed28: Merge change 26944 into eclair
Merge commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d'

* commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d':
  Add "TYPE=" to type attribute when appropriate.
2009-09-25 11:13:53 -07:00
Wei Huang
4e8804fa54 am 8feefb3e: am d35db5ec: Merge change 26946 into eclair
Merge commit '8feefb3e2067cc7d3c5b9c3b776538f264782021'

* commit '8feefb3e2067cc7d3c5b9c3b776538f264782021':
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
2009-09-25 11:13:43 -07:00
Daisuke Miyakawa
0b43103b46 am 5b774984: am b7e89e4c: Merge change 26912 into eclair
Merge commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c'

* commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c':
  Add appendType() utility method.
2009-09-25 11:12:11 -07:00
Nicolas Roard
13e8d6e016 am 08228fda: am dccf22dc: Merge change 26698 into eclair
Merge commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae'

* commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae':
  Fix the shortcuts
2009-09-25 11:11:37 -07:00
Bryan Mawhinney
753bc00f15 am cbafa094: am dfb7bc8c: Merge change 26821 into eclair
Merge commit 'cbafa094449f9e6646409b6bd26ba11956b32047'

* commit 'cbafa094449f9e6646409b6bd26ba11956b32047':
  Make removeOnAccountsUpdateListener cope with null handlers.
2009-09-25 11:11:31 -07:00
Fred Quintana
d0bde7ba9b am 93bc8cab: am 531e580a: remove the incorrectly located nickname
Merge commit '93bc8cab98784851b1bb080b57d059ac35fa619a'

* commit '93bc8cab98784851b1bb080b57d059ac35fa619a':
  remove the incorrectly located nickname
2009-09-25 11:11:22 -07:00
Grace Kloba
a0c2e57cc3 am 9f9a0ad5: am f4a36e86: Merge change 26909 into eclair
Merge commit '9f9a0ad5744a934a521578511b59566d05ed1784'

* commit '9f9a0ad5744a934a521578511b59566d05ed1784':
  Not all WebView's host have permission to read the history.
2009-09-25 11:11:16 -07:00
Dmitri Plotnikov
affabd66e0 am 7f8d14e8: am 6938bb36: Fixing the broken build
Merge commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9'

* commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9':
  Fixing the broken build
2009-09-25 11:10:38 -07:00
Cary Clark
abb34549b2 am f28ffd06: am f18c5393: set the selection after sending a click
Merge commit 'f28ffd0688d83c019e74a7d32759d5734396baa4'

* commit 'f28ffd0688d83c019e74a7d32759d5734396baa4':
  set the selection after sending a click
2009-09-25 11:10:08 -07:00
Dmitri Plotnikov
cde981dbac am 2841a1c1: am f22fc124: Adding timestamp and account to contact-level presence columns.
Merge commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08'

* commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08':
  Adding timestamp and account to contact-level presence columns.
2009-09-25 11:09:57 -07:00
Daisuke Miyakawa
68bb98fb9f am cc2465bb: am f2bed60b: Add final to appropriate variables.
Merge commit 'cc2465bbd5845fb128963f845589c8a6e41c64de'

* commit 'cc2465bbd5845fb128963f845589c8a6e41c64de':
  Add final to appropriate variables.
2009-09-25 11:09:51 -07:00
Daisuke Miyakawa
9bb967ef49 am 577d32a5: am b55e60e1: Fix vCard code.
Merge commit '577d32a57d1b21b40015ac202147e00e8243db63'

* commit '577d32a57d1b21b40015ac202147e00e8243db63':
  Fix vCard code.
2009-09-25 11:09:40 -07:00
Grace Kloba
069e2dda63 am 0eb9ac8f: am 43f99202: Merge change 26896 into eclair
Merge commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2'

* commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2':
  ResultTransport needs a default value. If the thread is
2009-09-25 11:09:27 -07:00
Satish Roddom
0bcd7ef6cc am 3f5db261: am 03d2009b: Merge change 26895 into eclair
Merge commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d'

* commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d':
  Subject issue in MMS message
2009-09-25 11:09:03 -07:00
Lixin Yue
bbdd9f9d9d am 2c01a82f: am bfe1297b: Merge change 26869 into eclair
Merge commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2'

* commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2':
  Add call log support to pim.vcard.VCardComposer
2009-09-25 11:08:34 -07:00
Grace Kloba
d38d3682b2 am 34b9dab1: am bb6aba19: Merge change 26876 into eclair
Merge commit '34b9dab1ba1db40378a3f425d0591d17e2fb91be'

* commit '34b9dab1ba1db40378a3f425d0591d17e2fb91be':
  Restrict touch to the view height with the title. This
2009-09-25 11:08:05 -07:00
Karl Rosaen
75ae374510 am 512fb951: am bb339ead: Merge change 26867 into eclair
Merge commit '512fb951a15ed45d432515b49acef2c2132195f8'

* commit '512fb951a15ed45d432515b49acef2c2132195f8':
  fix bug where siilent mode dissapears when it triggers instead of animating off to the left edge.
2009-09-25 11:07:27 -07:00
Leon Clarke
1a7412c09f am cf3a289f: am a3a840f9: Merge change 26830 into eclair
Merge commit 'cf3a289fedae593b4f0e4a12672efe33866016b5'

* commit 'cf3a289fedae593b4f0e4a12672efe33866016b5':
  Coloring clicked-on links
2009-09-25 11:07:21 -07:00
Amith Yamasani
f9721f67e4 am 80ab1b71: am c15255a9: Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
Merge commit '80ab1b7198cfad400af752e52541d29ee2f7ce23'

* commit '80ab1b7198cfad400af752e52541d29ee2f7ce23':
  Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
2009-09-25 11:06:30 -07:00
Karl Rosaen
1ad17a16d9 am b9393eae: am 9f8d59ee: Merge change 26714 into eclair
Merge commit 'b9393eae369ecad7b136153099498787caf7d7cd'

* commit 'b9393eae369ecad7b136153099498787caf7d7cd':
  Update RotarySelector to support vertical orientation, and add resolution specific assets (removing old ones).
2009-09-25 11:06:24 -07:00
Jeff Hamilton
073f29e821 am 919dc738: am 13ab701e: Merge change 26856 into eclair
Merge commit '919dc7389f7b7558497e766dade90608ac5ef132'

* commit '919dc7389f7b7558497e766dade90608ac5ef132':
  Make the new ContactsContract APIs public.
2009-09-25 11:05:59 -07:00
Andrei Popescu
d23f7260ea am 5866935c: am a7beb95e: Merge change 26818 into eclair
Merge commit '5866935c1bb0f53f8683d617f5cd7af8a78ed544'

* commit '5866935c1bb0f53f8683d617f5cd7af8a78ed544':
  Add possibility to customize the chooser dialog used to allow the user to choose the application for sharing a link.
2009-09-25 11:02:57 -07:00
Ben Murdoch
e57f24d3a0 am 223cb4fb: am d421995f: Fix parsing of HTTP Date years.
Merge commit '223cb4fb4a2e2f6ed8f841564cd951a5c083ffd1'

* commit '223cb4fb4a2e2f6ed8f841564cd951a5c083ffd1':
  Fix parsing of HTTP Date years.
2009-09-25 11:02:47 -07:00
Daisuke Miyakawa
83a54b479b am 3adab9fc: am 23703f16: Merge change 26732 into eclair
Merge commit '3adab9fcfffa57dd45e9ccace5e21123158e489b'

* commit '3adab9fcfffa57dd45e9ccace5e21123158e489b':
  Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
2009-09-25 11:02:26 -07:00
Jeff Sharkey
d037929626 am cc582a8e: am 63697af8: Generalize DELAY_STARRED_UPDATE location.
Merge commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2'

* commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2':
  Generalize DELAY_STARRED_UPDATE location.
2009-09-25 11:02:20 -07:00
Jeff Sharkey
3a322c9448 am dfd2f611: am 26d48eb3: Add Groups query parameters for delaying STARRED update.
Merge commit 'dfd2f6112ea497506aa4f636f6f8eb746c294b3c'

* commit 'dfd2f6112ea497506aa4f636f6f8eb746c294b3c':
  Add Groups query parameters for delaying STARRED update.
2009-09-25 11:02:10 -07:00
Dianne Hackborn
1bf5a19216 am ad8d9dfb: am ffa42480: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7'

* commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
2009-09-25 11:01:14 -07:00
Jeff Hamilton
a5215089d5 am f4c102c4: am 0c23212e: Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit 'f4c102c4a834dd17265780b2694759b113863c98'

* commit 'f4c102c4a834dd17265780b2694759b113863c98':
  Re-hide the contacts APIs, the droiddoc build is failing.
2009-09-25 11:00:22 -07:00
Lorenzo Colitti
cfeab40fc3 am 4d5cd955: am 7c5c6076: Merge change 26640 into eclair
Merge commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0'

* commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0':
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
2009-09-25 11:00:02 -07:00
Mathias Agopian
12b25b1289 am ed4efca6: am 63e118ed: Merge change 26776 into eclair
Merge commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f'

* commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f':
  wallpaper: don't erase the background, just to repaint over it. saves 1.7 ms on some hardware
2009-09-25 10:59:41 -07:00
Jeff Hamilton
8240258627 am 259540ad: am 85abdc59: Make the new ContactsContract public.
Merge commit '259540ad8d6219fb09d2c55b0486139028dc68d0'

* commit '259540ad8d6219fb09d2c55b0486139028dc68d0':
  Make the new ContactsContract public.
2009-09-25 10:59:16 -07:00
Dianne Hackborn
d813cbaef1 am b8f193da: am ce605142: Merge change 26717 into eclair
Merge commit 'b8f193da852dcd341b506dbbd14860be2ed3b2fc'

* commit 'b8f193da852dcd341b506dbbd14860be2ed3b2fc':
  Newer animations.
2009-09-25 10:55:50 -07:00
Wu-cheng Li
62156eacd8 am a3031157: am e6bea600: Change setRotation documentaion.
Merge commit 'a303115742777801b27b98fa4448ebac0ad8de14'

* commit 'a303115742777801b27b98fa4448ebac0ad8de14':
  Change setRotation documentaion.
2009-09-25 10:55:23 -07:00
Jim Miller
9109262bc9 am 1f21839a: am 8799b96e: Merge change 26314 into eclair
Merge commit '1f21839a9828995eb01634f36d34c55ca9aeca3e'

* commit '1f21839a9828995eb01634f36d34c55ca9aeca3e':
  Delay broadcasting ACCOUNTS_CHANGED until we're certain AndroidId is ready.
2009-09-25 10:55:01 -07:00
Fred Quintana
27bcfd3f1a am 3fee3fb6: am 8f1e5981: Merge change 26653 into eclair
Merge commit '3fee3fb646fc81d199007d1eacfef7abb4e0650c'

* commit '3fee3fb646fc81d199007d1eacfef7abb4e0650c':
  make the SyncManager listen for backgroun data setting changes and do a sync when the setting is enabled
2009-09-25 10:54:42 -07:00
Sanjay Jeyakumar
4e33f659e1 am ea986e30: am f017167f: Merge change 25794 into eclair
Merge commit 'ea986e301f3f67c3d3446961b5f316c7c4f3112c'

* commit 'ea986e301f3f67c3d3446961b5f316c7c4f3112c':
  Remove the GDD Gservices setting.
2009-09-25 10:51:49 -07:00
Debajit Ghosh
c086848a07 am 6351cf72: am 193a6261: Merge change 26537 into eclair
Merge commit '6351cf72a55def4e1bca5764dea8cbca99f13b90'

* commit '6351cf72a55def4e1bca5764dea8cbca99f13b90':
  add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
2009-09-25 10:51:43 -07:00
Cary Clark
4e021ac509 am 307ad592: am 37703b6c: invalidate the webview after pressing the IME \'next\' button
Merge commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa'

* commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa':
  invalidate the webview after pressing the IME 'next' button
2009-09-25 10:50:39 -07:00
Ray Chen
4298f3e3b9 am 94cdc3d0: am 830207ca: Merge change 25635 into eclair
Merge commit '94cdc3d0e2c7f4f001177829f6bbf3b52ce07b98'

* commit '94cdc3d0e2c7f4f001177829f6bbf3b52ce07b98':
  Add new thumbnail API.
2009-09-25 10:49:09 -07:00
Android (Google) Code Review
01f32e6b2e Merge change 26968
* changes:
  Clobber frameworks/base/core/java/android/speech in master with the one in eclair.
2009-09-25 12:22:23 -04:00
Leon Scroggins
9695de6bc4 am 2fd49438: am 6d181166: Merge change 26615 into eclair
Merge commit '2fd4943847d0209bef39171c1278ad6c86072dcc'

* commit '2fd4943847d0209bef39171c1278ad6c86072dcc':
  Provide a getter to access the width of the HTML document.
2009-09-25 08:52:58 -07:00
Wei Huang
309714fac9 am c3bfa604: am b06c9a8c: Merge change 26579 into eclair
Merge commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6'

* commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6':
  add definition for Mms.TempStorage content uri and filename.
2009-09-25 08:50:54 -07:00
Cary Clark
db9eaad8eb am 3c385116: am b82665e7: don\'t allow min scale to go to infinity
Merge commit '3c385116e98e6812813049206cb85417f1bccb21'

* commit '3c385116e98e6812813049206cb85417f1bccb21':
  don't allow min scale to go to infinity
2009-09-25 08:50:44 -07:00
Ben Murdoch
0b4263a2ed am ea2aabf1: am c28e3a67: Merge change 26595 into eclair
Merge commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8'

* commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8':
  Move destroying the web view to the WVC thread (previously it was on the UI thread)
2009-09-25 08:50:31 -07:00
Leon Scroggins
4f73c0021b am 90c0d0ab: am d4c00a17: Merge change 26590 into eclair
Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141'

* commit '90c0d0ab42ec909290abcc168ac0deded05a1141':
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-25 08:50:05 -07:00
Bjorn Bringert
97df191fbb am e7244b04: am dbce92ab: Merge change 26587 into eclair
Merge commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2'

* commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2':
  Back button in search always goes back or closes search
2009-09-25 08:49:55 -07:00