OSDN Git Service
Mike Lockwood [Wed, 9 Dec 2009 23:40:44 +0000 (15:40 -0800)]
am
259e3384: am
7e90005f: Merge change I705b1d33 into eclair
Merge commit '
259e3384face72ea8e30696d7bae492d37d44e8b' into eclair-mr2-plus-aosp
* commit '
259e3384face72ea8e30696d7bae492d37d44e8b':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Fred Quintana [Wed, 9 Dec 2009 23:40:06 +0000 (15:40 -0800)]
am
18ff0e32: am
1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '
18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp
* commit '
18ff0e329b314e033e4bfb92b24ecab961f0eb99':
remove an old STOPSHIP comment
Mike Lockwood [Tue, 8 Dec 2009 01:22:54 +0000 (17:22 -0800)]
am
7e90005f: Merge change I705b1d33 into eclair
Merge commit '
7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-mr2
* commit '
7e90005fcb95d4c20c92e915f4418b94341dda36':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Android (Google) Code Review [Tue, 8 Dec 2009 01:17:47 +0000 (17:17 -0800)]
Merge change I705b1d33 into eclair
* changes:
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Fred Quintana [Tue, 8 Dec 2009 01:04:40 +0000 (17:04 -0800)]
am
1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '
1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2
* commit '
1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
remove an old STOPSHIP comment
Android (Google) Code Review [Tue, 8 Dec 2009 00:59:46 +0000 (16:59 -0800)]
Merge change Ia5ef9acd into eclair
* changes:
remove an old STOPSHIP comment
Jaikumar Ganesh [Mon, 7 Dec 2009 23:57:28 +0000 (15:57 -0800)]
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.
Jaikumar Ganesh [Mon, 7 Dec 2009 23:53:02 +0000 (15:53 -0800)]
am
ae88e2d1: Merge change I38227501 into eclair
Merge commit '
ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2
* commit '
ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
Add API to get Active Sinks.
Android (Google) Code Review [Mon, 7 Dec 2009 23:49:50 +0000 (15:49 -0800)]
Merge change I38227501 into eclair
* changes:
Add API to get Active Sinks.
Mike Lockwood [Mon, 7 Dec 2009 23:43:36 +0000 (18:43 -0500)]
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Change-Id: I705b1d33af2d70aa1084cca8f6280fade9461d2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Robert Greenwalt [Mon, 7 Dec 2009 23:36:25 +0000 (15:36 -0800)]
am
54a4a66d: am
9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '
54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp
* commit '
54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
DO NOT MERGE Reverting change I53e91db7.
Jaikumar Ganesh [Mon, 7 Dec 2009 23:36:19 +0000 (15:36 -0800)]
am
47cc8112: am
9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '
47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp
* commit '
47cc8112c3f77637ef408ef18e48d146e8250a27':
Fix updating Bluetooth icon on status bar and for Wifi.
Robert Greenwalt [Mon, 7 Dec 2009 23:31:50 +0000 (15:31 -0800)]
am
9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '
9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2
* commit '
9ae9763b7e5dd872619b13c889b72b0df176f956':
DO NOT MERGE Reverting change I53e91db7.
Jaikumar Ganesh [Mon, 7 Dec 2009 23:31:43 +0000 (15:31 -0800)]
am
9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '
9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2
* commit '
9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
Android (Google) Code Review [Mon, 7 Dec 2009 23:27:19 +0000 (15:27 -0800)]
Merge change Ib097fbbf into eclair
* changes:
DO NOT MERGE Reverting change I53e91db7.
Android (Google) Code Review [Mon, 7 Dec 2009 23:27:02 +0000 (15:27 -0800)]
Merge change I204e4787 into eclair
* changes:
Fix updating Bluetooth icon on status bar and for Wifi.
Robert Greenwalt [Mon, 7 Dec 2009 23:20:50 +0000 (15:20 -0800)]
DO NOT MERGE Reverting change I53e91db7.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.
Do not merge this so the desired change will survive on mr2 as intended.
bug:
2265222
Jaikumar Ganesh [Fri, 4 Dec 2009 23:10:54 +0000 (15:10 -0800)]
Add API to get Active Sinks.
Allow incoming connections only when there are no active sinks.
Dr No: Eastham
Bug:
2133530
Jaikumar Ganesh [Mon, 7 Dec 2009 18:58:18 +0000 (10:58 -0800)]
Fix updating Bluetooth icon on status bar and for Wifi.
Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.
This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.
Dr No: Eastham
Bug:
2133530
Robert Greenwalt [Mon, 7 Dec 2009 23:13:51 +0000 (15:13 -0800)]
am
096871e7: am
90d1b745: Merge change I53e91db7 into eclair
Merge commit '
096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp
* commit '
096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
Filter out minor Connectivity Notifications.
Robert Greenwalt [Mon, 7 Dec 2009 23:09:46 +0000 (15:09 -0800)]
am
90d1b745: Merge change I53e91db7 into eclair
Merge commit '
90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2
* commit '
90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Android (Google) Code Review [Mon, 7 Dec 2009 23:04:52 +0000 (15:04 -0800)]
Merge change I53e91db7 into eclair
* changes:
Filter out minor Connectivity Notifications.
Vasu Nori [Mon, 7 Dec 2009 22:58:04 +0000 (14:58 -0800)]
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."
Android (Google) Code Review [Mon, 7 Dec 2009 22:54:36 +0000 (14:54 -0800)]
Merge change Ifa1fae13 into eclair-mr2
* changes:
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
Evan Millar [Mon, 7 Dec 2009 22:45:43 +0000 (14:45 -0800)]
am
b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit '
b5eb3902ff92f895328928c6a8e05c90104e0c13' into eclair-mr2-plus-aosp
* commit '
b5eb3902ff92f895328928c6a8e05c90104e0c13':
Add Sets#newSortedSet()
Android (Google) Code Review [Mon, 7 Dec 2009 22:41:49 +0000 (14:41 -0800)]
Merge change Ie70845ca into eclair-mr2
* changes:
Add Sets#newSortedSet()
Vasu Nori [Mon, 7 Dec 2009 22:38:35 +0000 (14:38 -0800)]
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
This reverts commit
6d1ec0d81cd8ecdd390b31e724bac554bb955a94.
Andreas Huber [Mon, 7 Dec 2009 22:36:01 +0000 (14:36 -0800)]
am
247003be: Merge change I250f2433 into eclair-mr2
Merge commit '
247003be9ea69928e35ce2f1bd1fab652920a3f2' into eclair-mr2-plus-aosp
* commit '
247003be9ea69928e35ce2f1bd1fab652920a3f2':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Android (Google) Code Review [Mon, 7 Dec 2009 22:31:46 +0000 (14:31 -0800)]
Merge change I250f2433 into eclair-mr2
* changes:
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Fred Quintana [Mon, 7 Dec 2009 22:23:33 +0000 (14:23 -0800)]
remove an old STOPSHIP comment
Andreas Huber [Mon, 7 Dec 2009 22:22:35 +0000 (14:22 -0800)]
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Evan Millar [Mon, 7 Dec 2009 22:01:33 +0000 (14:01 -0800)]
Add Sets#newSortedSet()
Robert Greenwalt [Mon, 7 Dec 2009 19:33:18 +0000 (11:33 -0800)]
Filter out minor Connectivity Notifications.
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.
bug:
2265222
Leon Scroggins [Mon, 7 Dec 2009 21:40:59 +0000 (13:40 -0800)]
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.
Grace Kloba [Mon, 7 Dec 2009 21:40:53 +0000 (13:40 -0800)]
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
Android (Google) Code Review [Mon, 7 Dec 2009 21:39:22 +0000 (13:39 -0800)]
Merge change Idff5eb2a into eclair-mr2
* changes:
Set InputType of WebTextView according to <input> field's type.
Leon Scroggins [Mon, 7 Dec 2009 18:38:07 +0000 (13:38 -0500)]
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.
Grace Kloba [Fri, 4 Dec 2009 03:12:49 +0000 (19:12 -0800)]
Expose onReceivedSslError() so that the WebView client
can accept the error and continue.
Fix http://b/issue?id=
2299152
Grace Kloba [Mon, 7 Dec 2009 21:09:49 +0000 (13:09 -0800)]
am
14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '
14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp
* commit '
14467eb2eea119b4d71dd7dd149479aa092e6de2':
Add "res" support for WebView.
Android (Google) Code Review [Mon, 7 Dec 2009 21:05:46 +0000 (13:05 -0800)]
Merge change I234162b0 into eclair-mr2
* changes:
Add "res" support for WebView.
Dave Sparks [Mon, 7 Dec 2009 21:04:56 +0000 (13:04 -0800)]
am
62679112: Merge change I3c256cf3 into eclair-mr2
Merge commit '
62679112a2ac98f6b73e9a5f6e92b3cb5728703c' into eclair-mr2-plus-aosp
* commit '
62679112a2ac98f6b73e9a5f6e92b3cb5728703c':
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Jason Sams [Mon, 7 Dec 2009 21:04:51 +0000 (13:04 -0800)]
am
ffacbc34: am
fd2f6358: Merge change I771bebb9 into eclair
Merge commit '
ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f' into eclair-mr2-plus-aosp
* commit '
ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f':
Add Java exceptions to catch RS calls with no context or no surface.
Android (Google) Code Review [Mon, 7 Dec 2009 21:02:56 +0000 (13:02 -0800)]
Merge change I3c256cf3 into eclair-mr2
* changes:
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Dave Sparks [Mon, 7 Dec 2009 21:01:01 +0000 (13:01 -0800)]
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Jason Sams [Mon, 7 Dec 2009 21:00:25 +0000 (13:00 -0800)]
am
fd2f6358: Merge change I771bebb9 into eclair
Merge commit '
fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-mr2
* commit '
fd2f6358321e95d661f24ba4e08327268035aa59':
Add Java exceptions to catch RS calls with no context or no surface.
Android (Google) Code Review [Mon, 7 Dec 2009 20:55:38 +0000 (12:55 -0800)]
Merge change I771bebb9 into eclair
* changes:
Add Java exceptions to catch RS calls with no context or no surface.
Daniel Sandler [Mon, 7 Dec 2009 20:51:01 +0000 (12:51 -0800)]
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.
Dave Sparks [Mon, 7 Dec 2009 20:50:55 +0000 (12:50 -0800)]
am
9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2
Merge commit '
9d5b7aca742f44e4b16db66a4a372eb71325470f' into eclair-mr2-plus-aosp
* commit '
9d5b7aca742f44e4b16db66a4a372eb71325470f':
Remove unused Java object reference in native SoundPool code.
Android (Google) Code Review [Mon, 7 Dec 2009 20:46:56 +0000 (12:46 -0800)]
Merge change I21eb4b87 into eclair-mr2
* changes:
Allow room for descenders in am/pm text.
Android (Google) Code Review [Mon, 7 Dec 2009 20:40:17 +0000 (12:40 -0800)]
Merge change Ic0e3ddf8 into eclair-mr2
* changes:
Remove unused Java object reference in native SoundPool code.
Jason Sams [Mon, 7 Dec 2009 20:40:12 +0000 (12:40 -0800)]
Add Java exceptions to catch RS calls with no context or no surface.
Eric Laurent [Mon, 7 Dec 2009 20:38:45 +0000 (12:38 -0800)]
am
38f6bdc4: am
0a08029f: Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit '
38f6bdc4187f27f86c7f77c88095c663e005dbf4' into eclair-mr2-plus-aosp
* commit '
38f6bdc4187f27f86c7f77c88095c663e005dbf4':
Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Eric Laurent [Mon, 7 Dec 2009 20:36:30 +0000 (12:36 -0800)]
am
0a08029f: Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit '
0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8' into eclair-mr2
* commit '
0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8':
Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Dave Sparks [Mon, 7 Dec 2009 20:36:20 +0000 (12:36 -0800)]
Remove unused Java object reference in native SoundPool code.
Grace Kloba [Mon, 7 Dec 2009 18:11:28 +0000 (10:11 -0800)]
Add "res" support for WebView.
http://b/issue?id=
2296839
Eric Laurent [Mon, 7 Dec 2009 18:53:10 +0000 (10:53 -0800)]
Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
The ToneGenerator failed to initialize because no more tracks were available in AudioFlinger mixer.
All tracks were used because the duplicating output was failing to free the tracks on audio hardware output mixer when exiting due to a misplaced test on output activity: output tracks where only freed if the duplicating output was active when exiting.
The fix consists in freeing the output tracks when the duplicating thread is destroyed without condition.
Andreas Huber [Mon, 7 Dec 2009 19:30:48 +0000 (11:30 -0800)]
am
8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '
8c7ab034692eea550b97bebd7746e1a82735bbbd' into eclair-mr2-plus-aosp
* commit '
8c7ab034692eea550b97bebd7746e1a82735bbbd':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Andreas Huber [Mon, 7 Dec 2009 19:23:44 +0000 (11:23 -0800)]
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Andreas Huber [Mon, 7 Dec 2009 19:06:20 +0000 (11:06 -0800)]
am
73abc2ea: Merge change I9c6e1f90 into eclair-mr2
Merge commit '
73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a' into eclair-mr2-plus-aosp
* commit '
73abc2ea4c4e23a5561bbf769b4b74d1faa38e4a':
Initial check in of stagefright software AAC decoder based on PV source code.
Eric Laurent [Mon, 7 Dec 2009 19:06:15 +0000 (11:06 -0800)]
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.
Yu Shan Emily Lau [Mon, 7 Dec 2009 19:06:09 +0000 (11:06 -0800)]
am
8e6d79e2: am
8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '
8e6d79e2b570d73b620a4f5a98d461329e5f2477' into eclair-mr2-plus-aosp
* commit '
8e6d79e2b570d73b620a4f5a98d461329e5f2477':
1) Capture the start memory before the test started
Android (Google) Code Review [Mon, 7 Dec 2009 19:03:28 +0000 (11:03 -0800)]
Merge change I9c6e1f90 into eclair-mr2
* changes:
Initial check in of stagefright software AAC decoder based on PV source code.
Eric Laurent [Mon, 7 Dec 2009 19:03:17 +0000 (11:03 -0800)]
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.
Andreas Huber [Mon, 7 Dec 2009 17:56:32 +0000 (09:56 -0800)]
Initial check in of stagefright software AAC decoder based on PV source code.
Android (Google) Code Review [Mon, 7 Dec 2009 19:00:54 +0000 (11:00 -0800)]
Merge change I9cc489a2 into eclair
* changes:
Fix issue
2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Yu Shan Emily Lau [Mon, 7 Dec 2009 18:54:38 +0000 (10:54 -0800)]
am
8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '
8445f367070514dce3154be73827107b8a93f234' into eclair-mr2
* commit '
8445f367070514dce3154be73827107b8a93f234':
1) Capture the start memory before the test started
Android (Google) Code Review [Mon, 7 Dec 2009 18:51:16 +0000 (10:51 -0800)]
Merge change Ibb9b1de1 into eclair
* changes:
1) Capture the start memory before the test started 2) Report the mem diff to zero if it is negative.
Andreas Huber [Mon, 7 Dec 2009 18:01:06 +0000 (10:01 -0800)]
am
5921fb51: Merge change I91eb0354 into eclair-mr2
Merge commit '
5921fb51e0219ddd7cad439a73495f320c57d50e' into eclair-mr2-plus-aosp
* commit '
5921fb51e0219ddd7cad439a73495f320c57d50e':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Android (Google) Code Review [Mon, 7 Dec 2009 17:57:12 +0000 (09:57 -0800)]
Merge change I91eb0354 into eclair-mr2
* changes:
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Andreas Huber [Mon, 7 Dec 2009 17:43:00 +0000 (09:43 -0800)]
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Leon Scroggins [Mon, 7 Dec 2009 15:39:06 +0000 (07:39 -0800)]
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.
Leon Scroggins [Fri, 4 Dec 2009 19:50:18 +0000 (14:50 -0500)]
Show search icon for <input type="search"> fields.
Along with a change to external/webkit, fixes http://b/issue?id=
2299650
Maryam Garrett [Mon, 7 Dec 2009 15:17:26 +0000 (07:17 -0800)]
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.
Android (Google) Code Review [Mon, 7 Dec 2009 15:14:41 +0000 (07:14 -0800)]
Merge change I9088d29b into eclair-mr2
* changes:
Improves the touch-based text selection UI in text boxes.
Daniel Sandler [Thu, 3 Dec 2009 16:46:03 +0000 (11:46 -0500)]
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
Eric Laurent [Sat, 5 Dec 2009 13:20:01 +0000 (05:20 -0800)]
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.
Dima Zavin [Mon, 7 Dec 2009 09:40:02 +0000 (01:40 -0800)]
am
401f4220: am
0019215f: Revert "When using MDP, we needed to use a texture for diming."
Merge commit '
401f422078581ae741b68d879609e57a4b227455' into eclair-mr2-plus-aosp
* commit '
401f422078581ae741b68d879609e57a4b227455':
Revert "When using MDP, we needed to use a texture for diming."
Dima Zavin [Mon, 7 Dec 2009 09:36:26 +0000 (01:36 -0800)]
am
0019215f: Revert "When using MDP, we needed to use a texture for diming."
Merge commit '
0019215fc395ef12c191049b1903eeabf70859cf' into eclair-mr2
* commit '
0019215fc395ef12c191049b1903eeabf70859cf':
Revert "When using MDP, we needed to use a texture for diming."
Dima Zavin [Mon, 7 Dec 2009 08:17:06 +0000 (00:17 -0800)]
Revert "When using MDP, we needed to use a texture for diming."
This reverts commit
bf0c320afbf6bf2441916755ecb443b64afbe73f.
Bjorn Bringert [Sat, 5 Dec 2009 22:00:07 +0000 (14:00 -0800)]
am
05a22548: Rename SearchableInfo in preloaded-classes
Merge commit '
05a22548dfbf697f9df7c53451c126999ed9a6f0' into eclair-mr2-plus-aosp
* commit '
05a22548dfbf697f9df7c53451c126999ed9a6f0':
Rename SearchableInfo in preloaded-classes
Bjorn Bringert [Sat, 5 Dec 2009 21:40:46 +0000 (21:40 +0000)]
Rename SearchableInfo in preloaded-classes
Without this, boot fails with:
12-05 21:06:56.984: ERROR/Zygote(435):
java.lang.IllegalStateException: Missing class(es) for preloading,
update preloaded-classes [android.server.search.SearchableInfo]
This was caused by https://android-git.corp.google.com/g/34797
Change-Id: I195b7e72a411401e2de8c1d6c2e7db0fe1badec6
Bjorn Bringert [Sat, 5 Dec 2009 18:26:04 +0000 (10:26 -0800)]
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
Android (Google) Code Review [Sat, 5 Dec 2009 18:21:01 +0000 (10:21 -0800)]
Merge change I9589f9c2 into eclair-mr2
* changes:
Move android.server.search.SearchableInfo to android.app
Romain Guy [Sat, 5 Dec 2009 01:06:04 +0000 (17:06 -0800)]
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.
Android (Google) Code Review [Sat, 5 Dec 2009 01:01:54 +0000 (17:01 -0800)]
Merge change I4039545e into eclair-mr2
* changes:
Fire OnGroupClick events when collapsing a group in ExpandableListView.
Romain Guy [Sat, 5 Dec 2009 00:51:52 +0000 (16:51 -0800)]
Fire OnGroupClick events when collapsing a group in ExpandableListView.
Doug Zongker [Sat, 5 Dec 2009 00:50:50 +0000 (16:50 -0800)]
am
f6683bb5: Merge change I5f1d2d24 into eclair-mr2
Merge commit '
f6683bb5592825a62e30760abb0734deaaf7bd93' into eclair-mr2-plus-aosp
* commit '
f6683bb5592825a62e30760abb0734deaaf7bd93':
move event log tags used by ActivityManager into this package
Android (Google) Code Review [Sat, 5 Dec 2009 00:46:28 +0000 (16:46 -0800)]
Merge change I5f1d2d24 into eclair-mr2
* changes:
move event log tags used by ActivityManager into this package
Doug Zongker [Fri, 4 Dec 2009 20:52:44 +0000 (12:52 -0800)]
move event log tags used by ActivityManager into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
Kenny Root [Sat, 5 Dec 2009 00:03:44 +0000 (16:03 -0800)]
am
fc32a062: Merge change I88721afe into eclair-mr2
Merge commit '
fc32a062f833df35ea153bbd857046052e2ce238' into eclair-mr2-plus-aosp
* commit '
fc32a062f833df35ea153bbd857046052e2ce238':
Fix bitmask in aapt's StringPool length construction
Android (Google) Code Review [Fri, 4 Dec 2009 23:59:59 +0000 (15:59 -0800)]
Merge change I88721afe into eclair-mr2
* changes:
Fix bitmask in aapt's StringPool length construction
Jack Palevich [Fri, 4 Dec 2009 23:59:10 +0000 (15:59 -0800)]
am
30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '
30d905235074f343ebac6002408ab5c2b360ea14' into eclair-mr2-plus-aosp
* commit '
30d905235074f343ebac6002408ab5c2b360ea14':
Improve error message thrown when eglCreateContext fails.
Improve error reporting by always returning the public
Android (Google) Code Review [Fri, 4 Dec 2009 23:55:47 +0000 (15:55 -0800)]
Merge changes Id682ab72,I9bb4dbae into eclair-mr2
* changes:
Improve error message thrown when eglCreateContext fails.
Improve error reporting by always returning the public EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.
Romain Guy [Fri, 4 Dec 2009 23:54:32 +0000 (15:54 -0800)]
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.)
Android (Google) Code Review [Fri, 4 Dec 2009 23:50:43 +0000 (15:50 -0800)]
Merge change If3c7d429 into eclair-mr2
* changes:
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
Andy McFadden [Fri, 4 Dec 2009 23:42:43 +0000 (15:42 -0800)]
am
ebc910da: Merge change Iaad9c8d1 into eclair-mr2
Merge commit '
ebc910da96f4dbb036e16971c1041f8287342aa4' into eclair-mr2-plus-aosp
* commit '
ebc910da96f4dbb036e16971c1041f8287342aa4':
Restore 7.xml.
Android (Google) Code Review [Fri, 4 Dec 2009 23:39:59 +0000 (15:39 -0800)]
Merge change Iaad9c8d1 into eclair-mr2
* changes:
Restore 7.xml.
Romain Guy [Fri, 4 Dec 2009 23:38:22 +0000 (15:38 -0800)]
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
When the user lifts her finger up, AbsListView computes the fling velocity
and report a SCROLL_STATE_FLING if the velocity is high enough. However,
when the fling is not initiated because the velocity is too low (case of
a normal scroll), the idle state was not set nor reported.
Suchi Amalapurapu [Fri, 4 Dec 2009 23:04:35 +0000 (15:04 -0800)]
am
ccbf4c28: am
ae952b3b: Merge change Ibe1c422a into eclair
Merge commit '
ccbf4c282f6d27602896b812485b41b74eaf8c6d' into eclair-mr2-plus-aosp
* commit '
ccbf4c282f6d27602896b812485b41b74eaf8c6d':
If the usage stats file doesn't exist in the first place there is no need to
Suchi Amalapurapu [Fri, 4 Dec 2009 23:01:49 +0000 (15:01 -0800)]
am
ae952b3b: Merge change Ibe1c422a into eclair
Merge commit '
ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2
* commit '
ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to