10858 Commits

Author SHA1 Message Date
Dianne Hackborn
3f63c58e40 am ccc624ca: am ebd45e5c: Merge change I55edce63 into eclair
Merge commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0'

* commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0':
  Fix issue #2149145: Safe Mode does not work on Sholes device
2009-09-29 11:10:53 -07:00
Mike Cleron
68ac73e69b am 1492b96e: am fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit '1492b96eb178631b816bdb253a1b6d1df8133e13'

* commit '1492b96eb178631b816bdb253a1b6d1df8133e13':
  Remove obsolete links; start at a method to turn on fading scrollbars
2009-09-29 11:09:35 -07:00
Wu-cheng Li
dfc1cb1cdf am 90b4a932: am fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Merge commit '90b4a93271520b2952b55520338b153192b834a6'

* commit '90b4a93271520b2952b55520338b153192b834a6':
  Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
2009-09-29 11:09:04 -07:00
Dianne Hackborn
aed865207f am b6eaaa2a: Clean up cacheColorHint to be better controlled by the theme.
Merge commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a' into eclair-plus-aosp

* commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a':
  Clean up cacheColorHint to be better controlled by the theme.
2009-09-29 11:08:54 -07:00
Xavier Ducrohet
f0aa856687 am 25c70dd9: am 279ba943: Merge change I7c7b1596 into eclair
Merge commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586'

* commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586':
  Fix a warning output.
2009-09-29 11:08:32 -07:00
Romain Guy
4f588a959d am ba016786: am b4c547a5: Fix possible NPE in AbsListView.positionSelector().
Merge commit 'ba0167861d71b0412503843369530575f0d9faeb'

* commit 'ba0167861d71b0412503843369530575f0d9faeb':
  Fix possible NPE in AbsListView.positionSelector().
2009-09-29 11:08:25 -07:00
Nick Pelly
ef41532861 am 3083a3c1: am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Merge commit '3083a3c11ae303e3fc17d9c7949a46b1e619c146'

* commit '3083a3c11ae303e3fc17d9c7949a46b1e619c146':
  Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
2009-09-29 11:07:30 -07:00
Bjorn Bringert
b525a9e784 am 575d73a1: am 2dfa6edc: Merge change Ida50e915 into eclair
Merge commit '575d73a15b33b000feb82f5243c6d9bec7e16083'

* commit '575d73a15b33b000feb82f5243c6d9bec7e16083':
  Pass limit=50 to all suggestion sources.
2009-09-29 11:06:45 -07:00
Dianne Hackborn
b6eaaa2ab2 Clean up cacheColorHint to be better controlled by the theme.
Fixes generic lists in dialog themes, for example.

Change-Id: I0ea1cae1641d8ab3756179ce80245ed0df942115
2009-09-29 11:02:39 -07:00
Dianne Hackborn
0b03fa8b6f am 490d5222: Merge change I6cacaa0d into eclair
Merge commit '490d5222ae985f7e606cdf503d292062c80e7328' into eclair-plus-aosp

* commit '490d5222ae985f7e606cdf503d292062c80e7328':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
2009-09-29 10:49:26 -07:00
Evan Millar
c14b32855b am 22cbf51e: Merge change I49fbfc68 into eclair
Merge commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be' into eclair-plus-aosp

* commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be':
  Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
2009-09-29 10:49:19 -07:00
John Wang
8658eaba1e am ac5bd144: Merge change Ib23e57cf into eclair
Merge commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f' into eclair-plus-aosp

* commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f':
  Set roaming based on both data and voice.
2009-09-29 10:49:12 -07:00
Android (Google) Code Review
490d5222ae Merge change I6cacaa0d into eclair
* changes:
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
2009-09-29 13:44:47 -04:00
Android (Google) Code Review
22cbf51ef5 Merge change I49fbfc68 into eclair
* changes:
  Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
2009-09-29 13:43:17 -04:00
Android (Google) Code Review
ac5bd144f1 Merge change Ib23e57cf into eclair
* changes:
  Set roaming based on both data and voice.
2009-09-29 13:26:06 -04:00
Dirk Dougherty
5f9be93958 am b0702880: am 50128088: Merge change I915efc49 into donut
Merge commit 'b0702880a35d0214bac20973e1459459c52a1e36' into eclair-plus-aosp

* commit 'b0702880a35d0214bac20973e1459459c52a1e36':
  Update docs for NDK.
2009-09-29 10:19:20 -07:00
Dirk Dougherty
a6c2740d69 am e34569fa: am bc0e07bf: Merge change I7b64ad2e into donut
Merge commit 'e34569fa54471214c3b58dd23ec17be900240a74' into eclair-plus-aosp

* commit 'e34569fa54471214c3b58dd23ec17be900240a74':
  doc change only. fix toc links on terms page.
2009-09-29 10:19:13 -07:00
Dirk Dougherty
b0702880a3 am 50128088: Merge change I915efc49 into donut
Merge commit '501280889ce2bed1b73e7e6ae0d8f4d0afba018a' into eclair

* commit '501280889ce2bed1b73e7e6ae0d8f4d0afba018a':
  Update docs for NDK.
2009-09-29 10:13:22 -07:00
lknguyen
f602c5170e Add Gservices flag for Vending doctor download complete timeout. 2009-09-29 10:04:26 -07:00
Android (Google) Code Review
501280889c Merge change I915efc49 into donut
* changes:
  Update docs for NDK.
2009-09-29 13:03:12 -04:00
Dirk Dougherty
a1b746ab3a Update docs for NDK.
Change-Id: I915efc49d0ea736e3fd408628d35f53e3a85c1df
2009-09-29 09:56:02 -07:00
Mark Wagner
b2c6429d4d border for the non-badge case
If we don't have a uri/email/phone then we do not display the normal
fast track badge.  But in that case we now have an alternate background/border
rather than no background/border.
2009-09-29 09:49:50 -07:00
Dirk Dougherty
e34569fa54 am bc0e07bf: Merge change I7b64ad2e into donut
Merge commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2' into eclair

* commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2':
  doc change only. fix toc links on terms page.
2009-09-29 08:56:21 -07:00
Robert Greenwalt
9274988e44 am 9f9ce253: Merge change I59ceeae4 into eclair
Merge commit '9f9ce253648ad9dda16ae2fd3131073fe5643536' into eclair-plus-aosp

* commit '9f9ce253648ad9dda16ae2fd3131073fe5643536':
  Fix the reporting of ActiveApnTypes on CDMA
2009-09-29 08:51:57 -07:00
Android (Google) Code Review
9f9ce25364 Merge change I59ceeae4 into eclair
* changes:
  Fix the reporting of ActiveApnTypes on CDMA
2009-09-29 11:42:46 -04:00
Android (Google) Code Review
bc0e07bf9a Merge change I7b64ad2e into donut
* changes:
  doc change only. fix toc links on terms page.
2009-09-29 11:42:03 -04:00
Evan Millar
db1f499398 Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
Change-Id: I49fbfc683f7089f052671b567ad3e19203a568f0
2009-09-29 08:38:07 -07:00
Grace Kloba
4435baa48a am 7745e035: Merge change I94c715d6 into eclair
Merge commit '7745e035c94409815850be4be93a300301da576e' into eclair-plus-aosp

* commit '7745e035c94409815850be4be93a300301da576e':
  Skip requestRectangleOnScreen for WebTextView during
2009-09-29 08:29:16 -07:00
Android (Google) Code Review
7745e035c9 Merge change I94c715d6 into eclair
* changes:
  Skip requestRectangleOnScreen for WebTextView during zoom animation. If it is in edit mode, we already adjust WebTextView in the end of zoom animation.
2009-09-29 11:19:48 -04:00
Bjorn Bringert
c055f86986 am 7db7e6a0: Merge change I17f45d35 into eclair
Merge commit '7db7e6a00c5a0b38bb2077d93a009581941884d3' into eclair-plus-aosp

* commit '7db7e6a00c5a0b38bb2077d93a009581941884d3':
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
2009-09-29 00:41:16 -07:00
Chung-yih Wang
d0af7f905f am 31522ad0: Merge change I931ce71e into eclair
Merge commit '31522ad0ca71013ac5437a1a43e9078a31ff2213' into eclair-plus-aosp

* commit '31522ad0ca71013ac5437a1a43e9078a31ff2213':
  Add unit test for the new keystore.
2009-09-29 00:41:10 -07:00
Android (Google) Code Review
7db7e6a00c Merge change I17f45d35 into eclair
* changes:
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
2009-09-29 03:35:53 -04:00
Android (Google) Code Review
31522ad0ca Merge change I931ce71e into eclair
* changes:
  Add unit test for the new keystore.
2009-09-29 03:27:21 -04:00
Dianne Hackborn
ce37120df3 am 7eca687c: Fix bug where we would return null with disabled components.
Merge commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9' into eclair-plus-aosp

* commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9':
  Fix bug where we would return null with disabled components.
2009-09-29 00:21:53 -07:00
Chung-yih Wang
f35e9663d7 Add unit test for the new keystore.
Since we need to test the keystore with user system in order to test
the reset(), password(), lock() and unlock(), we have to take advantage
of the ActivityUnitTestCase to run the test with the user 'system'.
2009-09-29 15:20:24 +08:00
Bjorn Bringert
86917dbb95 Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
Both GlobalSearch and the search dialog now pass
SearchManager.SUGGEST_PARAMETER_LIMIT as a query parameter to all
suggestion sources. Exposing this allows suggestion sources
to return only the number of results that the client requires.

Fixes http://b/issue?id=2150992

Change-Id: I17f45d35e8f302b11812f4bb6fee40b31dc15707
2009-09-29 08:14:35 +01:00
Dianne Hackborn
7eca687c2e Fix bug where we would return null with disabled components.
Change-Id: I1624a42803f1c4b02736f558a8eeeeba2890667e
2009-09-28 23:57:05 -07:00
Grace Kloba
94c715d662 Skip requestRectangleOnScreen for WebTextView during
zoom animation. If it is in edit mode, we already adjust
WebTextView in the end of zoom animation.

Fix part 1 of http://b/issue?id=2147168
2009-09-28 23:23:53 -07:00
Dianne Hackborn
4df43ab1d8 am ffc16544: Merge change Ib7c1701a into eclair
Merge commit 'ffc165446a7188cadfbc9f99fafac27d11254a54' into eclair-plus-aosp

* commit 'ffc165446a7188cadfbc9f99fafac27d11254a54':
  Fix issue #1930911: Crash in system process
2009-09-28 22:24:03 -07:00
Android (Google) Code Review
ffc165446a Merge change Ib7c1701a into eclair
* changes:
  Fix issue #1930911: Crash in system process
2009-09-29 01:18:57 -04:00
Dianne Hackborn
94d691499b Fix issue #1930911: Crash in system process
Ensure that we do all the work for removing a window's view
hierarchy in that window's thread.

Change-Id: Ib7c1701aee6b541b75fd1a680f6987f959f2ba88
2009-09-28 22:14:42 -07:00
John Michelau
a2fbe44783 am a2f5afe6: Merge change I27009b08 into eclair
Merge commit 'a2f5afe6c690ad84aec046c4fa0178f2ee590c8e' into eclair-plus-aosp

* commit 'a2f5afe6c690ad84aec046c4fa0178f2ee590c8e':
  Fix EVDO SNR signal bar calculation
2009-09-28 21:45:06 -07:00
Android (Google) Code Review
a2f5afe6c6 Merge change I27009b08 into eclair
* changes:
  Fix EVDO SNR signal bar calculation
2009-09-29 00:35:55 -04:00
Robert Greenwalt
59ceeae4ec Fix the reporting of ActiveApnTypes on CDMA
Previous fix limiting what was reported active was too strict, leading to
DISCONNECTED messages not being accepted (apn list was empty).

bug: 2151520
2009-09-28 21:04:22 -07:00
Dianne Hackborn
7219195066 am 6b1cb352: Fix issue #2149126: unable to answer incoming call, various problems
Merge commit '6b1cb352b86f2cf983026f2e6814665e12eb8452' into eclair-plus-aosp

* commit '6b1cb352b86f2cf983026f2e6814665e12eb8452':
  Fix issue #2149126: unable to answer incoming call, various problems
2009-09-28 20:04:01 -07:00
Dianne Hackborn
6b1cb352b8 Fix issue #2149126: unable to answer incoming call, various problems
Now that we can have a non-app-window cross-wallpaper animation,
we need to make sure to not access a null app token.

Change-Id: Ia00debd4b2b431d15bd074927a9035e1bc0a6445
2009-09-28 19:56:43 -07:00
John Wang
37b80ee451 Set roaming based on both data and voice.
In GSM network the data roaming (from +CGREG) and the voice roaming (from +CREG) could be different. Set GSM roaming based on both data and voice roaming status and set it true if either indicates roaming.

This solves the unwanted roaming billing issues and respects the download roaming setting in systemUpdater, DownloadProvider, and MMS downloader. For more details refer to bug 2052473.
2009-09-28 18:53:16 -07:00
Jason Sams
e88adf369a am ff966d5f: Merge change I5235cf3f into eclair
Merge commit 'ff966d5f6c88a9fba033f1bb5ec087464376534d' into eclair-plus-aosp

* commit 'ff966d5f6c88a9fba033f1bb5ec087464376534d':
  Fix but processing raster state pragma.
2009-09-28 18:39:03 -07:00
Mike Cleron
e6566064a9 am 0368334d: Merge change Ie1072f12 into eclair
Merge commit '0368334db91e923021df36ae9afb81ed8256abfd' into eclair-plus-aosp

* commit '0368334db91e923021df36ae9afb81ed8256abfd':
  Finish off java API to allow fading scrollbars
2009-09-28 18:38:55 -07:00
Jack Palevich
019116ce20 am 97702aac: Merge changes I82c78b83,I54f72d9d into eclair
Merge commit '97702aacfc7f84b473357ce102cc70da2a316032' into eclair-plus-aosp

* commit '97702aacfc7f84b473357ce102cc70da2a316032':
  Don't ask for pbuffer support, because we don't use any pbuffers.
  Print out EGL configuration info for the config we've chosen.
2009-09-28 18:38:48 -07:00