8999 Commits

Author SHA1 Message Date
Guang Zhu
422aa3468b am db9932c2: am 55bfddad: Merge change 24931 into eclair
Merge commit 'db9932c235afa0895fef80584b4813befe79d5c3'

* commit 'db9932c235afa0895fef80584b4813befe79d5c3':
  Fix the bogus crashes in layout and reliability tests (the device actually went offline).
2009-09-16 23:55:18 -07:00
Romain Guy
100c2c3c7c am ae7e8a76: am 944808f3: Merge change 24927 into eclair
Merge commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8'

* commit 'ae7e8a760d7ce3ab1ec6f965cc0164e8be3eeba8':
  Fix a possible NPE in View.
2009-09-16 23:55:10 -07:00
Jaikumar Ganesh
654864c1de am 61c15090: am 482d54bb: Add black listing of car kits by name.
Merge commit '61c150903cd56df26f9bf1c411ff20713d09a779'

* commit '61c150903cd56df26f9bf1c411ff20713d09a779':
  Add black listing of car kits by name.
2009-09-16 23:55:02 -07:00
Jim Miller
581593d630 am 7df4c83a: am df5e76f9: Merge change 24814 into eclair
Merge commit '7df4c83a95a3517532b3de4fdc2c07270609e67e'

* commit '7df4c83a95a3517532b3de4fdc2c07270609e67e':
  Enable log message for tracking issue #2092299.
2009-09-16 23:54:50 -07:00
Leon Scroggins
e328cb5fe6 am 9fc38f40: am d247aadf: Bring up the soft keyboard when touching a focused textfield.
Merge commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa'

* commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa':
  Bring up the soft keyboard when touching a focused textfield.
2009-09-16 23:54:42 -07:00
Grace Kloba
459ea40408 am d5a2813b: am dd817492: Remove trackball double click. Treat each click as a single click.
Merge commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01'

* commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01':
  Remove trackball double click. Treat each click as a single click.
2009-09-16 23:54:33 -07:00
Mike Lockwood
7a06c9070f am f6cd6d63: am 31504f0b: Merge change 24847 into eclair
Merge commit 'f6cd6d63db5630139721785f53e352c2745ca136'

* commit 'f6cd6d63db5630139721785f53e352c2745ca136':
  PowerManagerService: Fix keyboard backlight support:
2009-09-16 23:54:26 -07:00
Cary Clark
5cfb9fc19a am 3ff3e3fc: am 298d32e1: Set the minimum fling to the title height.
Merge commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8'

* commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8':
  Set the minimum fling to the title height.
2009-09-16 23:54:18 -07:00
Raphael
3b772b232d am d2bb9eae: am 7cec5430: Merge change 24903 into eclair
Merge commit 'd2bb9eae1737287f80a1d95acfdfb238c7058934'

* commit 'd2bb9eae1737287f80a1d95acfdfb238c7058934':
  Fix some LayoutBridge javadoc.
2009-09-16 23:54:10 -07:00
Android (Google) Code Review
b88ce51f1b Merge change 24674
* changes:
  Implement OmxJpegImageDecoder.
2009-09-16 23:48:19 -04:00
Eric Fischer
f62173ac7e am 76d82371: am 13bc4ad1: Merge change 24902 into eclair
Merge commit '76d82371a90e81f2d5214d7b16ba713cb73771d1'

* commit '76d82371a90e81f2d5214d7b16ba713cb73771d1':
  Add "rtsp" to the list of URL schemes that get linkified.
2009-09-16 18:02:43 -07:00
Guang Zhu
5041f2afc3 am 474443fa: am 1fa72447: Merge change 24898 into eclair
Merge commit '474443fac4926c46a09cec9f50024bf9ebe72c94'

* commit '474443fac4926c46a09cec9f50024bf9ebe72c94':
  Fix the parsing for instrumentation result, some Java exceptions are not reported right now
2009-09-16 18:02:28 -07:00
Grace Kloba
a79a5b99a7 am 920d01f8: am b6e164c7: Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the httpauth table.
Merge commit '920d01f80a34c4b9098f79433b14091caea6a38a'

* commit '920d01f80a34c4b9098f79433b14091caea6a38a':
  Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
2009-09-16 18:02:19 -07:00
Andreas Huber
ef3b9ca112 am 59621667: am 714ec136: Merge change 24742 into eclair
Merge commit '5962166750355c36efb9f209fcff33edf837186c'

* commit '5962166750355c36efb9f209fcff33edf837186c':
  Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
2009-09-16 18:01:32 -07:00
Grace Kloba
90cc6b9d1b am d161e3f2: am 0fdae4cc: Merge change 24747 into eclair
Merge commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989'

* commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989':
  Use floor to calculate the range to avoid the rounding error triggered
2009-09-16 18:01:24 -07:00
Bjorn Bringert
f4d1f8de1c am c16f6f33: am 6cb1330d: Merge change 24683 into eclair
Merge commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda'

* commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda':
  Tell GlobalSearch about searches without a suggestion
2009-09-16 18:00:59 -07:00
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Ravi K Yenduri
62e73f466e Update comment in mediaplayer.h.
When sending a MEDIA_INFO message, the second integer is supposed
to be an "info" code instead of an "error" code.
2009-09-16 15:14:40 -07:00
Jean-Baptiste Queru
ea5f767246 Update documentation for getVideoWidth and getVideoHeight.
Ref: http://code.google.com/p/android/issues/detail?id=3024
2009-09-16 15:06:25 -07:00
Eric Laurent
586b1cc139 am 6fc35e3e: am 91e2d865: Merge change 24337 into eclair
Merge commit '6fc35e3e7e6c61f2f7f5176d6979ae860f471e83'

* commit '6fc35e3e7e6c61f2f7f5176d6979ae860f471e83':
  Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
2009-09-16 15:05:48 -07:00
Bjorn Bringert
081f95ee8c am c0008342: am ab50b86b: Deprecate showSearchIconAsBadge and icon search attrs
Merge commit 'c00083425bacb27473e6ba45c826c9dd2bfc2457'

* commit 'c00083425bacb27473e6ba45c826c9dd2bfc2457':
  Deprecate showSearchIconAsBadge and icon search attrs
2009-09-16 15:05:39 -07:00
Hung-ying Tyan
a0af5cf7d6 am c5567ffb: am 3ccfaaa7: Merge change 24673 into eclair
Merge commit 'c5567ffb01a5cfb4b579d35aaee900239176ebce'

* commit 'c5567ffb01a5cfb4b579d35aaee900239176ebce':
  Add tests and misc fixes on keystore.
2009-09-16 15:05:31 -07:00
Android (Google) Code Review
6a20b823c3 Merge change 25293 into eclair
* changes:
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-16 17:38:53 -04:00
Nicolas Catania
ea8844811d am b615166c: Merge change 25279 into eclair
Merge commit 'b615166ce7ac554a0278a8bc364f301316e0c745' into eclair-plus-aosp

* commit 'b615166ce7ac554a0278a8bc364f301316e0c745':
  Added a field to track if the call is to a voicemail instance.
2009-09-16 14:33:51 -07:00
Karl Rosaen
4babd458da am 82df16c6: Merge change 25297 into eclair
Merge commit '82df16c6543e2c47056c14799845621717ac2b3b' into eclair-plus-aosp

* commit '82df16c6543e2c47056c14799845621717ac2b3b':
  Address romain's code review comments
2009-09-16 14:33:44 -07:00
Android (Google) Code Review
b615166ce7 Merge change 25279 into eclair
* changes:
  Added a field to track if the call is to a voicemail instance.
2009-09-16 17:25:51 -04:00
Android (Google) Code Review
82df16c654 Merge change 25297 into eclair
* changes:
  Address romain's code review comments
2009-09-16 15:37:40 -04:00
Cary Clark
20158b9ce5 am c9e2e661: slide the title if the site changes the scroll position
Merge commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79' into eclair-plus-aosp

* commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79':
  slide the title if the site changes the scroll position
2009-09-16 12:30:21 -07:00
Cary Clark
c9e2e661f0 slide the title if the site changes the scroll position
Slide the title away if the scroll is to zero or one, and the
title is partially or fully visible. Set the animation time
to at least SLIDE_TITLE_DURATION, currently set to 300 ms.
2009-09-16 15:22:24 -04:00
Guang Zhu
0c22890531 am a5526468: Merge change 25250 into eclair
Merge commit 'a5526468a38289cc17b231c0d0eca918e34ede49' into eclair-plus-aosp

* commit 'a5526468a38289cc17b231c0d0eca918e34ede49':
  Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.
2009-09-16 12:15:24 -07:00
Android (Google) Code Review
a5526468a3 Merge change 25250 into eclair
* changes:
  Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.
2009-09-16 15:07:55 -04:00
Mike Lockwood
bdd1f2e37e am 9092ab4d: Add support for launching activities when attaching to a car or desk dock.
Merge commit '9092ab4d458ad60b459d5fad52368bde5d25f665' into eclair-plus-aosp

* commit '9092ab4d458ad60b459d5fad52368bde5d25f665':
  Add support for launching activities when attaching to a car or desk dock.
2009-09-16 11:50:26 -07:00
Mike Lockwood
9092ab4d45 Add support for launching activities when attaching to a car or desk dock.
Categories CATEGORY_CAR_DOCK and CATEGORY_DESK_DOCK can be assigned to
activities to make them launchable on docked events.
This is a better mechanism than listening for ACTION_DOCK_EVENT with a broadcast receiver.

Change-Id: Ic5f3ab3555ce02ca922bc31ebba41978cefe8bda
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-16 14:43:21 -04:00
Eric Fischer
5a7477cee8 am 764916d0: Merge change 23383 into eclair
Merge commit '764916d01b779ccc8064946c6ba2962fe063ed86' into eclair-plus-aosp

* commit '764916d01b779ccc8064946c6ba2962fe063ed86':
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-16 11:40:37 -07:00
Jack Palevich
c05a7f6216 am fee6b69a: Merge change 25303 into eclair
Merge commit 'fee6b69a7ce38118423c114abb977fd1b053be3c' into eclair-plus-aosp

* commit 'fee6b69a7ce38118423c114abb977fd1b053be3c':
  Add EGL call error checking.
2009-09-16 11:40:30 -07:00
Cynthia Wong
fc1a365740 am f5a5f045: Merge change 25296 into eclair
Merge commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8' into eclair-plus-aosp

* commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8':
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-16 11:40:23 -07:00
Android (Google) Code Review
764916d01b Merge change 23383 into eclair
* changes:
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-16 14:36:56 -04:00
Android (Google) Code Review
fee6b69a7c Merge change 25303 into eclair
* changes:
  Add EGL call error checking.
2009-09-16 14:33:20 -04:00
Android (Google) Code Review
f5a5f04550 Merge change 25296 into eclair
* changes:
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-16 14:16:47 -04:00
Amith Yamasani
1272442f1c am 0abc859e: Merge change 25299 into eclair
Merge commit '0abc859e14fe557479cab490493e64ca6ab05e6e' into eclair-plus-aosp

* commit '0abc859e14fe557479cab490493e64ca6ab05e6e':
  Show keyboard automatically in EditTextPreference dialogs
2009-09-16 11:15:14 -07:00
Nicolas Catania
60d45f0f03 Added a field to track if the call is to a voicemail instance.
Refactored common code between CallerInfo and CallerInfoAsyncQuery that deal
with voicemail number comparison.

In CallerInfo.java added a new field mIsVoiceMail to indicate this is a
voicemail call.
Added a new method to convert the CallerInfo into a VM instance.
Added a new method to generate a debug string from an instance.

PhoneNumberUtils has a new method "isVoiceMailNumber" to check if a number
is a VM one. I left the method as hidden. Previously any security exception
failure was cached in a static variable. I removed that and
privilege the optmistic scenario. I am not sure if the security exception
is only for the 'regular' telephony layer and if it applies if a 3rd party
VM app is installed (e.g googlevoice), hence i removed the cashing to make
sure we can pick up new voicemail providers when installed/enabled/disabled.

Bug:2112640
2009-09-16 11:11:05 -07:00
Jack Palevich
113096d5d0 Add EGL call error checking. 2009-09-16 11:08:43 -07:00
Android (Google) Code Review
0abc859e14 Merge change 25299 into eclair
* changes:
  Show keyboard automatically in EditTextPreference dialogs
2009-09-16 14:06:34 -04:00
Eric Laurent
917ec94734 am 99d20717: Merge change 25265 into eclair
Merge commit '99d20717b7fea022052bbb36dde468aaad67d8c7' into eclair-plus-aosp

* commit '99d20717b7fea022052bbb36dde468aaad67d8c7':
  Fix issue 2123668: Class scope typo in AudioFlinger.cpp.
2009-09-16 11:00:54 -07:00
Android (Google) Code Review
99d20717b7 Merge change 25265 into eclair
* changes:
  Fix issue 2123668: Class scope typo in AudioFlinger.cpp.
2009-09-16 13:56:12 -04:00
James Dong
f8bee3c7c7 am 2fa86ffc: am 6085b4e7: Pass return code from Camera HAL for setParameters(). bug 2116866
Merge commit '2fa86ffcba23137bb296972b98a119723e133000'

* commit '2fa86ffcba23137bb296972b98a119723e133000':
  Pass return code from Camera HAL for setParameters().
2009-09-16 10:51:59 -07:00
Amith Yamasani
1d45857075 Show keyboard automatically in EditTextPreference dialogs 2009-09-16 10:51:56 -07:00
Bob Lee
dfefa7f355 am e0100f47: am 93f00def: Merge change 24509 into eclair
Merge commit 'e0100f4736b987af22a719f740c3c25793b0a95e'

* commit 'e0100f4736b987af22a719f740c3c25793b0a95e':
  Addressed reviewer comments.
2009-09-16 10:51:32 -07:00
Karl Rosaen
1ca654e119 Address romain's code review comments 2009-09-16 10:51:10 -07:00
Ye Wen
b41e0ee61c am a4726088: am 9a0bf14c: Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority from "im" to "com.google.android.providers.talk"; also change the mime types.
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'

* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
  Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
2009-09-16 10:50:28 -07:00