6151 Commits

Author SHA1 Message Date
Daniel Sandler
f43eeef301 am 10c1dfad: Merge change Ifea65fb9 into eclair-mr2
Merge commit '10c1dfad63ee7dace03b7914faf3c9891d096e25' into eclair-mr2-plus-aosp

* commit '10c1dfad63ee7dace03b7914faf3c9891d096e25':
  Move the emergency call button to the top-right when there's no SIM.
2009-12-09 15:45:26 -08:00
Derek Sollenberger
45ccb6a55e am 51ef573a: Switching from activity based full screen plugins to a view system overlay.
Merge commit '51ef573a8336c637ac508c49b84b512d8f11fa3a' into eclair-mr2-plus-aosp

* commit '51ef573a8336c637ac508c49b84b512d8f11fa3a':
  Switching from activity based full screen plugins to a view system overlay.
2009-12-09 15:44:30 -08:00
Trevor Johns
15650af4ab am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp

* commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad':
  Updating list of standard Intents in android.content.Intent
2009-12-09 15:43:13 -08:00
Wu-cheng Li
90073aadd5 am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp

* commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-09 15:42:20 -08:00
Dianne Hackborn
aeabdf32a2 am 0766b2d0: Update service example code.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp

* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
  Update service example code.
2009-12-09 15:41:30 -08:00
Fred Quintana
517ebaa69a am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp

* commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99':
  remove an old STOPSHIP comment
2009-12-09 15:40:06 -08:00
Android (Google) Code Review
10c1dfad63 Merge change Ifea65fb9 into eclair-mr2
* changes:
  Move the emergency call button to the top-right when there's no SIM.
2009-12-08 07:59:34 -08:00
Derek Sollenberger
51ef573a83 Switching from activity based full screen plugins to a view system overlay. 2009-12-08 08:12:44 -05:00
Trevor Johns
7e42e8f334 am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2

* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
  Updating list of standard Intents in android.content.Intent
2009-12-07 22:42:46 -08:00
Trevor Johns
d59fb6e743 Updating list of standard Intents in android.content.Intent
documentation.
2009-12-07 22:38:49 -08:00
Wu-cheng Li
ebc7799444 am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2

* commit '9c79938d47a3caa06e5fb956955374f30c55992b':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-07 19:38:01 -08:00
Dianne Hackborn
0766b2d0f3 Update service example code.
Switch aidl sample to match the change in ApiDemos, add sample code
to the Service class.
2009-12-07 18:06:09 -08:00
Wu-cheng Li
9c79938d47 Document that some parameters will not be null and fix getSupportedPictureFormats. 2009-12-08 09:41:08 +08:00
Fred Quintana
18ff0e329b am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
2009-12-07 17:04:40 -08:00
Android (Google) Code Review
1067c3cbab Merge change Ia5ef9acd into eclair
* changes:
  remove an old STOPSHIP comment
2009-12-07 16:59:46 -08:00
Jaikumar Ganesh
dbdabca716 am b08170ad: am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp

* commit 'b08170ad7e4ca4908852b0e20759ea740b338a03':
  Add API to get Active Sinks.
2009-12-07 15:57:28 -08:00
Jaikumar Ganesh
b08170ad7e am ae88e2d1: Merge change I38227501 into eclair
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2

* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
  Add API to get Active Sinks.
2009-12-07 15:53:02 -08:00
Android (Google) Code Review
ae88e2d130 Merge change I38227501 into eclair
* changes:
  Add API to get Active Sinks.
2009-12-07 15:49:50 -08:00
Jaikumar Ganesh
b16c4f7dd9 Add API to get Active Sinks.
Allow incoming connections only when there are no active sinks.

Dr No: Eastham
Bug: 2133530
2009-12-07 15:20:31 -08:00
Vasu Nori
976ed43786 am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp

* commit '6be01bf207077ffbdcd3879250171a26ec805835':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:58:04 -08:00
Android (Google) Code Review
6be01bf207 Merge change Ifa1fae13 into eclair-mr2
* changes:
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:54:36 -08:00
Evan Millar
4adf801737 am b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13' into eclair-mr2-plus-aosp

* commit 'b5eb3902ff92f895328928c6a8e05c90104e0c13':
  Add Sets#newSortedSet()
2009-12-07 14:45:43 -08:00
Android (Google) Code Review
b5eb3902ff Merge change Ie70845ca into eclair-mr2
* changes:
  Add Sets#newSortedSet()
2009-12-07 14:41:49 -08:00
Vasu Nori
fa1fae1355 Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
This reverts commit 6d1ec0d81cd8ecdd390b31e724bac554bb955a94.
2009-12-07 14:38:35 -08:00
Fred Quintana
a5ef9acdf4 remove an old STOPSHIP comment 2009-12-07 14:23:33 -08:00
Evan Millar
049070d365 Add Sets#newSortedSet() 2009-12-07 14:21:33 -08:00
Leon Scroggins
0092ee13e4 am 6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '6761e85d41dedf4e783217922a5fedac2b7a654d' into eclair-mr2-plus-aosp

* commit '6761e85d41dedf4e783217922a5fedac2b7a654d':
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:40:59 -08:00
Grace Kloba
8657978aab am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit 'ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp

* commit 'ddcea3d21645bb3037703c84807dae077aae62ce':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 13:40:53 -08:00
Android (Google) Code Review
6761e85d41 Merge change Idff5eb2a into eclair-mr2
* changes:
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:39:22 -08:00
Leon Scroggins
aa7b9d7826 Set InputType of WebTextView according to <input> field's type.
Help fix http://b/issue?id=2150538 and http://b/issue?id=1890360

Use the <input type> information to set the InputType, so that
the IME can show the correct options.  Also consolidate setup
of WebTextView into setType().

Requires a change in external/webkit.
2009-12-07 16:36:34 -05:00
Grace Kloba
ddcea3d216 Expose onReceivedSslError() so that the WebView client
can accept the error and continue.

Fix http://b/issue?id=2299152
2009-12-07 13:20:33 -08:00
Grace Kloba
a49f91a2cb am 14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp

* commit '14467eb2eea119b4d71dd7dd149479aa092e6de2':
  Add "res" support for WebView.
2009-12-07 13:09:49 -08:00
Android (Google) Code Review
14467eb2ee Merge change I234162b0 into eclair-mr2
* changes:
  Add "res" support for WebView.
2009-12-07 13:05:46 -08:00
Daniel Sandler
0128c250e3 am 1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp

* commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57':
  Allow room for descenders in am/pm text.
2009-12-07 12:51:01 -08:00
Daniel Sandler
7aacc59abe Move the emergency call button to the top-right when there's no SIM.
In the process, clean up the way the lock screen's "toasts"
are handled so that those also match the desired UI.

http://b/2260798
2009-12-07 15:47:28 -05:00
Android (Google) Code Review
1b15acf705 Merge change I21eb4b87 into eclair-mr2
* changes:
  Allow room for descenders in am/pm text.
2009-12-07 12:46:56 -08:00
Grace Kloba
bd5c823e28 Add "res" support for WebView.
http://b/issue?id=2296839
2009-12-07 12:36:05 -08:00
Eric Laurent
e30bae7f8e am b8341cf7: am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp

* commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:06:15 -08:00
Eric Laurent
b8341cf7c8 am 6d42d806: Merge change I9cc489a2 into eclair
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:17 -08:00
Leon Scroggins
0b1a9f7648 am 9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5' into eclair-mr2-plus-aosp

* commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5':
  Show search icon for <input type="search"> fields.
2009-12-07 07:39:06 -08:00
Leon Scroggins
9e3e2d3a69 Show search icon for <input type="search"> fields.
Along with a change to external/webkit, fixes http://b/issue?id=2299650
2009-12-07 10:21:41 -05:00
Maryam Garrett
44e537a859 am 7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '7c42703082574638ecaa88ea18b0cc94bfabea2d' into eclair-mr2-plus-aosp

* commit '7c42703082574638ecaa88ea18b0cc94bfabea2d':
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:17:26 -08:00
Android (Google) Code Review
7c42703082 Merge change I9088d29b into eclair-mr2
* changes:
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:14:41 -08:00
Daniel Sandler
21eb4b8735 Allow room for descenders in am/pm text.
The lock screen clock layout was previously cropping them
off; in locales that use "PM" this is fine, but Spanish
(e.g.) uses "p.m."

Fixes http://b/2277477
2009-12-07 09:25:56 -05:00
Eric Laurent
9cc489a219 Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.

Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
2009-12-07 05:37:47 -08:00
Bjorn Bringert
8d96261346 am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '6dba0680cd3bc0bd987a3d01fc49421897528f20' into eclair-mr2-plus-aosp

* commit '6dba0680cd3bc0bd987a3d01fc49421897528f20':
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:26:04 -08:00
Android (Google) Code Review
6dba0680cd Merge change I9589f9c2 into eclair-mr2
* changes:
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:21:01 -08:00
Romain Guy
16c82c34ed am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21' into eclair-mr2-plus-aosp

* commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-04 17:06:04 -08:00
Romain Guy
4039545ed6 Fire OnGroupClick events when collapsing a group in ExpandableListView. 2009-12-04 16:51:52 -08:00
Romain Guy
e300deaf2f am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'b6936607b61e3115b5924e41be29c0430dd05613' into eclair-mr2-plus-aosp

* commit 'b6936607b61e3115b5924e41be29c0430dd05613':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:54:32 -08:00