Commit Graph

3535 Commits

Author SHA1 Message Date
Grace Kloba
0ef6499fdb am c1653764: am ff22b182: Merge change 25401 into eclair
Merge commit 'c165376408804893c2f086282850862371910aed'

* commit 'c165376408804893c2f086282850862371910aed':
  Add a null checking to avoid crash.
2009-09-17 12:15:46 -07:00
Bryan Mawhinney
ccf15ac53c am 45130cff: am c7aef5d0: Merge change 25477 into eclair
Merge commit '45130cff81187eced54c37b27efd0da9e21598a4'

* commit '45130cff81187eced54c37b27efd0da9e21598a4':
  Make ACTV use all available space if height is FILL_PARENT.
2009-09-17 12:15:28 -07:00
Andrei Popescu
b4284bd9c5 am a3a40a30: am b65c5cf0: Merge change 25098 into eclair
Merge commit 'a3a40a3099914bcfa98fc381ea9d905602497b41'

* commit 'a3a40a3099914bcfa98fc381ea9d905602497b41':
  Poster support on the Java side
2009-09-17 12:15:19 -07:00
Bjorn Bringert
fd13165c74 am f2c7040b: am 76f01118: Merge change 25362 into eclair
Merge commit 'f2c7040b7fa4bd018107ea14815939c5d5ce5aa8'

* commit 'f2c7040b7fa4bd018107ea14815939c5d5ce5aa8':
  Handle BACK key with focus in search ACTV correctly
2009-09-17 12:14:42 -07:00
Fred Quintana
076ef940af am a1112e4c: am e9351608: Merge change 25406 into eclair
Merge commit 'a1112e4cdaae9aadf3c8ffa0c7008dbd0997ff14'

* commit 'a1112e4cdaae9aadf3c8ffa0c7008dbd0997ff14':
  remove the signin required notification as when the signin is successful
2009-09-17 12:14:24 -07:00
Jeff Sharkey
4e2ecccb28 am d2f52de6: am 81521abe: Merge change 25431 into eclair
Merge commit 'd2f52de6dd8bf17017f4c43fbdb303dbf7e92372'

* commit 'd2f52de6dd8bf17017f4c43fbdb303dbf7e92372':
  Add "MMS" to common phone number types.
2009-09-17 12:13:59 -07:00
Amith Yamasani
82ae45f773 am aa3620f3: am 12cc9d82: Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit 'aa3620f3999ccf2d79105bdc3641ce4c9134032e'

* commit 'aa3620f3999ccf2d79105bdc3641ce4c9134032e':
  Add a new flag for IMEs to disable suggestions for certain fields.
2009-09-17 12:13:42 -07:00
Jaikumar Ganesh
137e9a7a54 am d92593bb: am cc670b5c: Merge change 25323 into eclair
Merge commit 'd92593bb6e2e80b03bd261e9e86c0907b6939200'

* commit 'd92593bb6e2e80b03bd261e9e86c0907b6939200':
  Change handling of remoteUuids.
2009-09-17 12:12:58 -07:00
Jaikumar Ganesh
45c2da09ba am 4f377394: am 972f0e38: Merge change 25325 into eclair
Merge commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6'

* commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6':
  Add a parcelable version of UUID file.
2009-09-17 12:12:49 -07:00
Eric Fischer
8532e4e255 am b3278a5c: am 0828beee: Merge change 25386 into eclair
Merge commit 'b3278a5c8a625b5bfe532eea0c1e30d24695f4ae'

* commit 'b3278a5c8a625b5bfe532eea0c1e30d24695f4ae':
  Add one more hardware keyboard character popup: \ if you hold /
2009-09-17 12:12:16 -07:00
Leon Scroggins
379edc4cfe am 3ce97308: am 38456260: Merge change 25369 into eclair
Merge commit '3ce9730848f5e1b0ab277eb77932fe60b888b2fd'

* commit '3ce9730848f5e1b0ab277eb77932fe60b888b2fd':
  Update the input method when the selection changes.
2009-09-17 12:12:00 -07:00
Fred Quintana
3f0ea3abba am fd6bb030: am 5f78786c: Merge change 25190 into eclair
Merge commit 'fd6bb030fde10603e8d8d5deaeeee2b132e8b2c4'

* commit 'fd6bb030fde10603e8d8d5deaeeee2b132e8b2c4':
  add the ability to do a newAssert with no values
2009-09-17 12:11:52 -07:00
Romain Guy
5cbbf0afde am 2437de94: am 32c687c2: Merge change 25351 into eclair
Merge commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e'

* commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e':
  Change Theme.Light's background back to pure white.
2009-09-17 12:11:23 -07:00
Leon Scroggins
ce20ffddfd am 3eb9a78a: am 4295613a: Merge change 25307 into eclair
Merge commit '3eb9a78a254395097cbb28e3826d25014422ead5'

* commit '3eb9a78a254395097cbb28e3826d25014422ead5':
  Allow touches to change the selection in WebTextView.
2009-09-17 12:11:14 -07:00
Evan Millar
1d42db5380 am 6c42a4ba: am 6a20b823: Merge change 25293 into eclair
Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0'

* commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0':
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-17 12:10:55 -07:00
Jean-Baptiste Queru
e910ef2258 am e525eef4: merge from open-source master
Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'

* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
  Update comment in mediaplayer.h.
  Update documentation for getVideoWidth and getVideoHeight.
  Make Uri.parseUserPart, parseHost, and parsePort symmetric
  Javadoc used startApplication() which doesnt exists, changed to createApplication()
2009-09-17 12:10:47 -07:00
Karl Rosaen
ae32ac6e2e am 4babd458: am 82df16c6: Merge change 25297 into eclair
Merge commit '4babd458daa3fd7ff73110b1689094a9586a3c46'

* commit '4babd458daa3fd7ff73110b1689094a9586a3c46':
  Address romain's code review comments
2009-09-17 09:59:29 -07:00
Cary Clark
611be54a5c am 20158b9c: am c9e2e661: slide the title if the site changes the scroll position
Merge commit '20158b9ce5895fdbdedf5db103583264d94a62a4'

* commit '20158b9ce5895fdbdedf5db103583264d94a62a4':
  slide the title if the site changes the scroll position
2009-09-17 09:58:27 -07:00
Mike Lockwood
ca4bb53c76 am bdd1f2e3: am 9092ab4d: Add support for launching activities when attaching to a car or desk dock.
Merge commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b'

* commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b':
  Add support for launching activities when attaching to a car or desk dock.
2009-09-17 09:57:52 -07:00
Eric Fischer
165bc88555 am 5a7477ce: am 764916d0: Merge change 23383 into eclair
Merge commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18'

* commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18':
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-17 09:57:40 -07:00
Cynthia Wong
9ff2e9392d am fc1a3657: am f5a5f045: Merge change 25296 into eclair
Merge commit 'fc1a365740478f61e671fe669fc466a9a753f031'

* commit 'fc1a365740478f61e671fe669fc466a9a753f031':
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-17 09:57:24 -07:00
Amith Yamasani
4fa32578c1 am 1272442f: am 0abc859e: Merge change 25299 into eclair
Merge commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2'

* commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2':
  Show keyboard automatically in EditTextPreference dialogs
2009-09-17 09:56:43 -07:00
Cary Clark
26b10afe9e am a78a1579: am 9f28d900: Merge change 25280 into eclair
Merge commit 'a78a157905ae49a170b0e2239df96b1f365f646d'

* commit 'a78a157905ae49a170b0e2239df96b1f365f646d':
  Don't scroll on load if titlebar is visible
2009-09-17 09:55:21 -07:00
Bjorn Bringert
db511f4cd8 am 5e3f452c: am 57384101: Merge change 25270 into eclair
Merge commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c'

* commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c':
  Use Resources to load search icons with android.resource URIs
2009-09-17 09:54:14 -07:00
Chih-Chung Chang
d127d2027f am 146a0fab: am 46ad7961: Unhide cancelAutoFocus API in Camera.
Merge commit '146a0fabb2db8d0677621d716ea02198c6a795ab'

* commit '146a0fabb2db8d0677621d716ea02198c6a795ab':
  Unhide cancelAutoFocus API in Camera.
2009-09-17 09:53:48 -07:00
Wu-cheng Li
70224719d8 am a326c816: am 7478ea68: Remove trailing spaces.
Merge commit 'a326c8160fa10c9954e9872f754309b1850d8ff4'

* commit 'a326c8160fa10c9954e9872f754309b1850d8ff4':
  Remove trailing spaces.
2009-09-17 09:53:00 -07:00
Jeff Sharkey
a4d37d85bf am 46f11652: am 85628188: Merge change 25244 into eclair
Merge commit '46f116520fe7ec04e99dd37d805fc852a71bf795'

* commit '46f116520fe7ec04e99dd37d805fc852a71bf795':
  Flag indicating if Contacts source has any unsynced groups.
2009-09-17 09:51:57 -07:00
Dianne Hackborn
31612db5f5 am 10bedaaf: am 7fc39b26: Merge change 25238 into eclair
Merge commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d'

* commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d':
  Implement issue #1780928: Need support hiding nav keys.
2009-09-17 09:51:33 -07:00
Jeff Sharkey
c3474ed7cb am 454e3c84: am 9352b9fb: Merge change 25232 into eclair
Merge commit '454e3c848feee705df79ea02feca5c9b97bfc5de'

* commit '454e3c848feee705df79ea02feca5c9b97bfc5de':
  Fix NPE when provider returns null cursor.
2009-09-17 09:51:01 -07:00
Daisuke Miyakawa
e39646b836 am 055714dd: am 6cf05f1c: Merge change 25206 into eclair
Merge commit '055714ddbb0db6634e362b357f5e11a77444c6de'

* commit '055714ddbb0db6634e362b357f5e11a77444c6de':
  Make vCard importer code use Account information if possible.
2009-09-17 09:49:55 -07:00
Karl Rosaen
802f7e4e02 am 20dfa6ab: am c6587dc8: Merge change 25178 into eclair
Merge commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00'

* commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00':
  Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
2009-09-17 09:49:20 -07:00
Dianne Hackborn
3a3defb98a am c5624813: am 6ee7b04d: Merge change 25192 into eclair
Merge commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f'

* commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f':
  Some improvements for wallpaper configuration.
2009-09-17 09:48:54 -07:00
Derek Sollenberger
2f114591d7 am 4b3cb661: am 5862b673: Merge change 25187 into eclair
Merge commit '4b3cb66144134a5fa289a6cfed65add0ff13d43b'

* commit '4b3cb66144134a5fa289a6cfed65add0ff13d43b':
  fixing documentation for PluginStub
2009-09-17 09:48:17 -07:00
Jim Miller
725967dffc am f2b0fb8c: am 7c3e493d: Merge change 25177 into eclair
Merge commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3'

* commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3':
  Fix for #2092883: Allow manual sync even when background data is disabled
2009-09-17 09:47:47 -07:00
Derek Sollenberger
e67777ed3d am 21da3357: am 64ce0f8f: Merge change 24200 into eclair
Merge commit '21da33570278762d7e9375b83eb74130bf82728d'

* commit '21da33570278762d7e9375b83eb74130bf82728d':
  First pass at replacing native plugin views with java.
2009-09-17 09:46:15 -07:00
Grace Kloba
c165376408 am ff22b182: Merge change 25401 into eclair
Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp

* commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296':
  Add a null checking to avoid crash.
2009-09-17 08:48:53 -07:00
Alex Gruenstein
255b8dd250 am 4b6a278c: Merge change 25366 into eclair
Merge commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3' into eclair-plus-aosp

* commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3':
  do not merge.  Revert "do not merge.  Remove voicesearch-specific functionality from framework."
2009-09-17 08:48:45 -07:00
Bryan Mawhinney
45130cff81 am c7aef5d0: Merge change 25477 into eclair
Merge commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017' into eclair-plus-aosp

* commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017':
  Make ACTV use all available space if height is FILL_PARENT.
2009-09-17 08:48:31 -07:00
Andrei Popescu
a3a40a3099 am b65c5cf0: Merge change 25098 into eclair
Merge commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0' into eclair-plus-aosp

* commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0':
  Poster support on the Java side
2009-09-17 08:48:00 -07:00
Bjorn Bringert
f2c7040b7f am 76f01118: Merge change 25362 into eclair
Merge commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c' into eclair-plus-aosp

* commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c':
  Handle BACK key with focus in search ACTV correctly
2009-09-17 08:46:57 -07:00
Fred Quintana
a1112e4cda am e9351608: Merge change 25406 into eclair
Merge commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6' into eclair-plus-aosp

* commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6':
  remove the signin required notification as when the signin is successful
2009-09-17 08:46:32 -07:00
Jeff Sharkey
d2f52de6dd am 81521abe: Merge change 25431 into eclair
Merge commit '81521abea121683643cedbb7483a9a7eb0e466ae' into eclair-plus-aosp

* commit '81521abea121683643cedbb7483a9a7eb0e466ae':
  Add "MMS" to common phone number types.
2009-09-17 08:45:16 -07:00
Amith Yamasani
aa3620f399 am 12cc9d82: Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a' into eclair-plus-aosp

* commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a':
  Add a new flag for IMEs to disable suggestions for certain fields.
2009-09-17 08:44:53 -07:00
Jaikumar Ganesh
d92593bb6e am cc670b5c: Merge change 25323 into eclair
Merge commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48' into eclair-plus-aosp

* commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48':
  Change handling of remoteUuids.
2009-09-17 08:43:41 -07:00
Jaikumar Ganesh
4f377394a9 am 972f0e38: Merge change 25325 into eclair
Merge commit '972f0e3806f379b7fb6e43265f56ddd91c38107e' into eclair-plus-aosp

* commit '972f0e3806f379b7fb6e43265f56ddd91c38107e':
  Add a parcelable version of UUID file.
2009-09-17 08:43:19 -07:00
Eric Fischer
b3278a5c8a am 0828beee: Merge change 25386 into eclair
Merge commit '0828beee503b99a8f38f456416592d4ed6c799ae' into eclair-plus-aosp

* commit '0828beee503b99a8f38f456416592d4ed6c799ae':
  Add one more hardware keyboard character popup: \ if you hold /
2009-09-17 08:42:29 -07:00
Leon Scroggins
3ce9730848 am 38456260: Merge change 25369 into eclair
Merge commit '38456260b919497bf948c1e3fd5a7b76b5dda68a' into eclair-plus-aosp

* commit '38456260b919497bf948c1e3fd5a7b76b5dda68a':
  Update the input method when the selection changes.
2009-09-17 08:41:50 -07:00
Fred Quintana
fd6bb030fd am 5f78786c: Merge change 25190 into eclair
Merge commit '5f78786cf9802b988a4de3c08555eb43f1e02e04' into eclair-plus-aosp

* commit '5f78786cf9802b988a4de3c08555eb43f1e02e04':
  add the ability to do a newAssert with no values
2009-09-17 08:41:34 -07:00
Romain Guy
2437de94ed am 32c687c2: Merge change 25351 into eclair
Merge commit '32c687c20d6ac3080b396787147892dc85126b33' into eclair-plus-aosp

* commit '32c687c20d6ac3080b396787147892dc85126b33':
  Change Theme.Light's background back to pure white.
2009-09-17 08:39:53 -07:00
Leon Scroggins
3eb9a78a25 am 4295613a: Merge change 25307 into eclair
Merge commit '4295613a0ea1f61398d3123746740ca27d9ea170' into eclair-plus-aosp

* commit '4295613a0ea1f61398d3123746740ca27d9ea170':
  Allow touches to change the selection in WebTextView.
2009-09-17 08:39:45 -07:00