Commit Graph

4721 Commits

Author SHA1 Message Date
Leon Scroggins
5fc2c1cc6c am d247aadf: Bring up the soft keyboard when touching a focused textfield.
Merge commit 'd247aadfc4b8117130908c44a2ed1f6d290a92ef' into eclair-plus-aosp

* commit 'd247aadfc4b8117130908c44a2ed1f6d290a92ef':
  Bring up the soft keyboard when touching a focused textfield.
2009-09-14 14:18:12 -07:00
Grace Kloba
ebdffe26b9 am dd817492: Remove trackball double click. Treat each click as a single click.
Merge commit 'dd8174928c9c2966b1491acd604612a3b38e600a' into eclair-plus-aosp

* commit 'dd8174928c9c2966b1491acd604612a3b38e600a':
  Remove trackball double click. Treat each click as a single click.
2009-09-14 13:43:56 -07:00
Mike Lockwood
8a9da7f756 am 31504f0b: Merge change 24847 into eclair
Merge commit '31504f0bf41f65500c46af448dc3bad2523e70f4' into eclair-plus-aosp

* commit '31504f0bf41f65500c46af448dc3bad2523e70f4':
  PowerManagerService: Fix keyboard backlight support:
2009-09-14 12:45:44 -07:00
Android (Google) Code Review
cbb5afe266 Merge change 24847 into eclair
* changes:
  PowerManagerService: Fix keyboard backlight support:
2009-09-14 15:39:16 -04:00
Cary Clark
57fa6253f2 am 298d32e1: Set the minimum fling to the title height.
Merge commit '298d32e1934cddf6b93e6a4588ab05630cd39ec7' into eclair-plus-aosp

* commit '298d32e1934cddf6b93e6a4588ab05630cd39ec7':
  Set the minimum fling to the title height.
2009-09-14 12:32:08 -07:00
Raphael
2ea2ee14d5 am 7cec5430: Merge change 24903 into eclair
Merge commit '7cec54302d421dd8c45ea25456b9677a7aa3d8d3' into eclair-plus-aosp

* commit '7cec54302d421dd8c45ea25456b9677a7aa3d8d3':
  Fix some LayoutBridge javadoc.
2009-09-14 12:12:51 -07:00
Android (Google) Code Review
aa8c6c7f2c Merge change 24903 into eclair
* changes:
  Fix some LayoutBridge javadoc.
2009-09-14 15:05:49 -04:00
Eric Fischer
0349d09a43 am 13bc4ad1: Merge change 24902 into eclair
Merge commit '13bc4ad18bc401c2a80e7dde8cba18841d709a78' into eclair-plus-aosp

* commit '13bc4ad18bc401c2a80e7dde8cba18841d709a78':
  Add "rtsp" to the list of URL schemes that get linkified.
2009-09-14 12:02:13 -07:00
Android (Google) Code Review
cfd82e1078 Merge change 24902 into eclair
* changes:
  Add "rtsp" to the list of URL schemes that get linkified.
2009-09-14 14:54:42 -04:00
Guang Zhu
a651d791ad am 1fa72447: Merge change 24898 into eclair
Merge commit '1fa724470c4fbe64741ef1fd2eefc4d5438da896' into eclair-plus-aosp

* commit '1fa724470c4fbe64741ef1fd2eefc4d5438da896':
  Fix the parsing for instrumentation result, some Java exceptions are not reported right now
2009-09-14 11:34:01 -07:00
Grace Kloba
9a3c83de53 am b6e164c7: Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the httpauth table.
Merge commit 'b6e164c779881cf68768224bd67a8d949be0618a' into eclair-plus-aosp

* commit 'b6e164c779881cf68768224bd67a8d949be0618a':
  Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
2009-09-14 11:33:56 -07:00
Android (Google) Code Review
16b30190fa Merge change 24898 into eclair
* changes:
  Fix the parsing for instrumentation result, some Java exceptions are not reported right now
2009-09-14 14:29:15 -04:00
Andreas Huber
9ec790164d am 714ec136: Merge change 24742 into eclair
Merge commit '714ec1360cde8b1cbf6e6b8572256e4100f11560' into eclair-plus-aosp

* commit '714ec1360cde8b1cbf6e6b8572256e4100f11560':
  Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
2009-09-14 10:13:30 -07:00
Android (Google) Code Review
6a47930275 Merge change 24742 into eclair
* changes:
  Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
2009-09-14 13:08:02 -04:00
Grace Kloba
b026f87da4 am 0fdae4cc: Merge change 24747 into eclair
Merge commit '0fdae4cc744c3be3855b47e82d2244df8503258c' into eclair-plus-aosp

* commit '0fdae4cc744c3be3855b47e82d2244df8503258c':
  Use floor to calculate the range to avoid the rounding error triggered
2009-09-14 09:32:57 -07:00
Android (Google) Code Review
f07861318b Merge change 24747 into eclair
* changes:
  Use floor to calculate the range to avoid the rounding error triggered scrollbar. The worst case is that you can never scroll down to the last pixel. The old special case can cause problem when getViewWidth/Height have changed which do not match mLastXXSent any more.
2009-09-14 12:27:40 -04:00
Bjorn Bringert
e2c2e91078 am 6cb1330d: Merge change 24683 into eclair
Merge commit '6cb1330d26d2fe8a01c33ab3fbaee2bfebb6f47e' into eclair-plus-aosp

* commit '6cb1330d26d2fe8a01c33ab3fbaee2bfebb6f47e':
  Tell GlobalSearch about searches without a suggestion
2009-09-14 08:39:31 -07:00
Android (Google) Code Review
334c6036a9 Merge change 24683 into eclair
* changes:
  Tell GlobalSearch about searches without a suggestion
2009-09-14 11:30:43 -04:00
Eric Laurent
5bbfd4e8b2 am 91e2d865: Merge change 24337 into eclair
Merge commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430' into eclair-plus-aosp

* commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430':
  Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
2009-09-13 23:50:52 -07:00
Android (Google) Code Review
f79cbd93e6 Merge change 24337 into eclair
* changes:
  Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
2009-09-14 02:43:52 -04:00
Bjorn Bringert
c836bae618 am ab50b86b: Deprecate showSearchIconAsBadge and icon search attrs
Merge commit 'ab50b86b79936623b5e326f2ed84b3c947c8ec93' into eclair-plus-aosp

* commit 'ab50b86b79936623b5e326f2ed84b3c947c8ec93':
  Deprecate showSearchIconAsBadge and icon search attrs
2009-09-13 23:31:54 -07:00
Hung-ying Tyan
a51588dba4 am 3ccfaaa7: Merge change 24673 into eclair
Merge commit '3ccfaaa70f25c8343ab45974a7a43cf9b9b15903' into eclair-plus-aosp

* commit '3ccfaaa70f25c8343ab45974a7a43cf9b9b15903':
  Add tests and misc fixes on keystore.
2009-09-13 23:31:49 -07:00
Android (Google) Code Review
4f5d9bd8b1 Merge change 24673 into eclair
* changes:
  Add tests and misc fixes on keystore.
2009-09-13 23:44:52 -04:00
James Dong
46e06a7652 am 6085b4e7: Pass return code from Camera HAL for setParameters(). bug 2116866
Merge commit '6085b4e7b5c592c398904748b56f95a77ced4ed5' into eclair-plus-aosp

* commit '6085b4e7b5c592c398904748b56f95a77ced4ed5':
  Pass return code from Camera HAL for setParameters().
2009-09-13 20:43:27 -07:00
James Dong
102f777f2c Pass return code from Camera HAL for setParameters().
bug 2116866
2009-09-13 17:12:35 -07:00
Bob Lee
bd3f1ea375 am 93f00def: Merge change 24509 into eclair
Merge commit '93f00def4b63511be91057b2bc69f1dda6f038e9' into eclair-plus-aosp

* commit '93f00def4b63511be91057b2bc69f1dda6f038e9':
  Addressed reviewer comments.
2009-09-13 15:48:31 -07:00
Android (Google) Code Review
d44c882e66 Merge change 24509 into eclair
* changes:
  Addressed reviewer comments.
2009-09-13 18:43:38 -04:00
Ye Wen
4a58ea47dd 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 '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8' into eclair-plus-aosp

* commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8':
  Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
2009-09-12 08:27:03 -07:00
Mathias Agopian
230ca49904 am d2cc4273: Merge change 24825 into eclair
Merge commit 'd2cc42733eb13063754c654921a58d34bfdb1c65' into eclair-plus-aosp

* commit 'd2cc42733eb13063754c654921a58d34bfdb1c65':
  fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer
2009-09-11 19:27:44 -07:00
Android (Google) Code Review
7b8ce0127d Merge change 24825 into eclair
* changes:
  fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer
2009-09-11 22:19:10 -04:00
Mathias Agopian
40d5799622 fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer 2009-09-11 19:18:20 -07:00
Robert Greenwalt
ab82fad7f6 am f376c837: Merge change 24805 into eclair
Merge commit 'f376c837ea9d5b89c668ff8306f2a404bed4ff05' into eclair-plus-aosp

* commit 'f376c837ea9d5b89c668ff8306f2a404bed4ff05':
  Don't init wifiChannels until after supplicant up
2009-09-11 18:14:10 -07:00
Jack Wang
87510a3eea am e441dcbb: Merge change 22561 into eclair
Merge commit 'e441dcbb4ed197cf248420308f5eaa935333651e' into eclair-plus-aosp

* commit 'e441dcbb4ed197cf248420308f5eaa935333651e':
  Performance measurement framework:
2009-09-11 18:09:34 -07:00
Android (Google) Code Review
dcf9e36c61 Merge change 24805 into eclair
* changes:
  Don't init wifiChannels until after supplicant up
2009-09-11 21:08:38 -04:00
Yu Shan Emily Lau
fa3eb442ce am 9a7efa45: Merge change 24789 into eclair
Merge commit '9a7efa452909b7a4f12840c44291c51a699acade' into eclair-plus-aosp

* commit '9a7efa452909b7a4f12840c44291c51a699acade':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-11 18:05:02 -07:00
Android (Google) Code Review
ad95907dc8 Merge change 22561 into eclair
* changes:
  Performance measurement framework:
2009-09-11 21:02:54 -04:00
Android (Google) Code Review
5407268076 Merge change 24789 into eclair
* changes:
  	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java 	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java Fix the m4a1 duration and the also fix the random_seek time error in the stress test.
2009-09-11 20:59:42 -04:00
Robert Greenwalt
d4481f0bbf am a28948d7: Merge change 24754 into eclair
Merge commit 'a28948d754fc5e1b631d9bd53f0072d0ae5878ea' into eclair-plus-aosp

* commit 'a28948d754fc5e1b631d9bd53f0072d0ae5878ea':
  Handle secondary APN connect failures.
2009-09-11 17:59:28 -07:00
Android (Google) Code Review
1500fcbdd0 Merge change 24754 into eclair
* changes:
  Handle secondary APN connect failures.
2009-09-11 20:53:43 -04:00
Christopher Tate
69757ba61f am 38eeac30: Merge change 24797 into eclair
Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp

* commit '38eeac305a188b7ea4f586071c1d467c3f952be6':
  Don't backup/restore telephony material from secure settings
2009-09-11 17:13:23 -07:00
Android (Google) Code Review
88b13187aa Merge change 24797 into eclair
* changes:
  Don't backup/restore telephony material from secure settings
2009-09-11 20:04:01 -04:00
Costin Manolache
22f0a2e4a5 am d3e061fc: Merge change 24609 into eclair
Merge commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61' into eclair-plus-aosp

* commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61':
  If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the  event again.
2009-09-11 16:29:47 -07:00
Android (Google) Code Review
1f8d2f3d68 Merge change 24609 into eclair
* changes:
  If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the  event again.
2009-09-11 19:24:44 -04:00
johnwang
73c22da0e8 am b942db35: Merge change 24773 into eclair
Merge commit 'b942db35c52acc6842438b0de8f60d4de1e34e21' into eclair-plus-aosp

* commit 'b942db35c52acc6842438b0de8f60d4de1e34e21':
  Fix NPE in TelephonyManager.
2009-09-11 15:36:10 -07:00
Android (Google) Code Review
a7e2314225 Merge change 24773 into eclair
* changes:
  Fix NPE in TelephonyManager.
2009-09-11 18:26:02 -04:00
Mike Lockwood
8c3a7267b8 am 66c2a976: Merge change 24762 into eclair
Merge commit '66c2a976705b62fe1721157e934b52d4a49de8f7' into eclair-plus-aosp

* commit '66c2a976705b62fe1721157e934b52d4a49de8f7':
  dumpstate: Switch back to running as non-root
2009-09-11 14:50:27 -07:00
Android (Google) Code Review
5e2789a98d Merge change 24762 into eclair
* changes:
  dumpstate: Switch back to running as non-root
2009-09-11 17:45:10 -04:00
Romain Guy
d1aeba5cd6 am 02ee5387: Merge change 24764 into eclair
Merge commit '02ee5387d3b9904f18d639f4d49612f4b3563eed' into eclair-plus-aosp

* commit '02ee5387d3b9904f18d639f4d49612f4b3563eed':
  Add @Widget annotation to GestureOverlayView to make it usable in ADT.
2009-09-11 14:36:20 -07:00
Android (Google) Code Review
820e5fd516 Merge change 24764 into eclair
* changes:
  Add @Widget annotation to GestureOverlayView to make it usable in ADT.
2009-09-11 17:30:46 -04:00
Jaikumar Ganesh
ec7881d53c am 32d8571f: Changes for BT 2.1
Merge commit '32d8571f509c392dca732c243e9b2138c15daecf' into eclair-plus-aosp

* commit '32d8571f509c392dca732c243e9b2138c15daecf':
  Changes for BT 2.1
2009-09-11 14:27:33 -07:00