Commit Graph

7814 Commits

Author SHA1 Message Date
Ben Murdoch
0b4263a2ed am ea2aabf1: am c28e3a67: Merge change 26595 into eclair
Merge commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8'

* commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8':
  Move destroying the web view to the WVC thread (previously it was on the UI thread)
2009-09-25 08:50:31 -07:00
Leon Scroggins
4f73c0021b am 90c0d0ab: am d4c00a17: Merge change 26590 into eclair
Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141'

* commit '90c0d0ab42ec909290abcc168ac0deded05a1141':
  In calcOurContentVisibleRect, account for the visible title bar.
2009-09-25 08:50:05 -07:00
Bjorn Bringert
97df191fbb am e7244b04: am dbce92ab: Merge change 26587 into eclair
Merge commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2'

* commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2':
  Back button in search always goes back or closes search
2009-09-25 08:49:55 -07:00
Dianne Hackborn
89c11c14b7 am 8f0d6469: am c413d54c: Merge change 26573 into eclair
Merge commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a'

* commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a':
  Fix bug where onStartCommand() was never called with a null intent.
2009-09-25 08:49:12 -07:00
Daisuke Miyakawa
95db01c186 am b452ea0e: am d2cd9467: Suppress warning around old vcard code.
Merge commit 'b452ea0e6835e95d4b5cdf50911f3d4a1fce34f1'

* commit 'b452ea0e6835e95d4b5cdf50911f3d4a1fce34f1':
  Suppress warning around old vcard code.
2009-09-25 08:48:52 -07:00
Daisuke Miyakawa
4d88d816ea am 4337a244: am c32897a6: Suppress Performance log emitted by vCard importer.
Merge commit '4337a244c43fd431598dd3fd0890accd1e394607'

* commit '4337a244c43fd431598dd3fd0890accd1e394607':
  Suppress Performance log emitted by vCard importer.
2009-09-25 08:48:46 -07:00
Daisuke Miyakawa
c226734d70 am 90b76580: am 3559c14c: Merge change 26549 into eclair
Merge commit '90b765807e1658493b328be34ef50c44ba7ccf03'

* commit '90b765807e1658493b328be34ef50c44ba7ccf03':
  Add Website.TYPE information.
2009-09-25 08:48:39 -07:00
Fred Quintana
1a0fa5093b am f73afeee: am be3bceb5: fix the logic for starting a sync after the accounts changed
Merge commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1'

* commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1':
  fix the logic for starting a sync after the accounts changed
2009-09-25 08:48:02 -07:00
Fred Quintana
2c22c1f4d1 am d5b16418: am 3de07024: Merge change 26456 into eclair
Merge commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c'

* commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c':
  - make an AccountManager per context, not one per process
2009-09-25 08:47:23 -07:00
Daniel Sandler
3cd1f3dcfb am 2b0d6e7e: am 520ca7e5: Merge change 26415 into eclair
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'

* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
  Add support for thumbnails to WallpaperInfo.
2009-09-25 08:46:23 -07:00
Jesse Wilson
9659c13be3 am 7ca38352: am c3c6621a: Merge change 25879 into eclair
Merge commit '7ca38352b911bfd299f5862da930e388eba7f903'

* commit '7ca38352b911bfd299f5862da930e388eba7f903':
  Setting the default HTTP user agent at runtime init.
2009-09-25 08:46:16 -07:00
Bryan Mawhinney
7e74262ab6 am 82e62668: Merge change 27038 into eclair
Merge commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8' into eclair-plus-aosp

* commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8':
  Redraw search autocomplete dropdown after config change.
2009-09-25 07:50:12 -07:00
Android (Google) Code Review
82e62668d0 Merge change 27038 into eclair
* changes:
  Redraw search autocomplete dropdown after config change.
2009-09-25 10:43:10 -04:00
Bryan Mawhinney
29d52e120f Redraw search autocomplete dropdown after config change.
This ensures the dropdown is redrawn after changing
from landscape to portrait mode, for example.

Change-Id: I71f4425d1df789faf34d20dd30b3a5c64b5caec3
2009-09-25 15:35:21 +01:00
Bjorn Bringert
079b824cf0 am 81d84c0c: am 6266e40a: Better JavaDoc for Activity.onSearchRequested().
Merge commit '81d84c0cb244290a58bf8e78a3d638750cf7dd3f' into eclair-plus-aosp

* commit '81d84c0cb244290a58bf8e78a3d638750cf7dd3f':
  Better JavaDoc for Activity.onSearchRequested().
2009-09-25 06:51:01 -07:00
Bjorn Bringert
81d84c0cb2 am 6266e40a: Better JavaDoc for Activity.onSearchRequested().
Merge commit '6266e40a754d82afa717ef068898c8418a0bb5c3' into eclair

* commit '6266e40a754d82afa717ef068898c8418a0bb5c3':
  Better JavaDoc for Activity.onSearchRequested().
2009-09-25 06:45:02 -07:00
Bjorn Bringert
6266e40a75 Better JavaDoc for Activity.onSearchRequested().
Fixes http://b/issue?id=1248721
2009-09-25 14:25:41 +01:00
Bryan Mawhinney
067e0164ca am 42b7af57: Dismiss QSB dialog when doing an in-app global search.
Merge commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc' into eclair-plus-aosp

* commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc':
  Dismiss QSB dialog when doing an in-app global search.
2009-09-25 04:15:01 -07:00
Bryan Mawhinney
42b7af57c5 Dismiss QSB dialog when doing an in-app global search.
This prevents QSB from obscuring the results when they are handled
by the current application.

Bug: 2141208
Change-Id: I6f848aa2003c75b97effe1d3d2af5316ad4fbf92
2009-09-25 11:09:55 +01:00
Dianne Hackborn
c6cfd0b0cc am 3e2ac884: Fix/improve issue #2142662: too easy to click a link/item instead of fling
Merge commit '3e2ac8843489e83c4171aabcfe98769b5159a5c8' into eclair-plus-aosp

* commit '3e2ac8843489e83c4171aabcfe98769b5159a5c8':
  Fix/improve issue #2142662: too easy to click a link/item instead of fling
2009-09-25 01:44:28 -07:00
Dianne Hackborn
3e2ac88434 Fix/improve issue #2142662: too easy to click a link/item instead of fling
Reduce the slop.

Change-Id: If255e68cc8092e7f746a91c0fea27abfc5292b73
2009-09-25 01:34:28 -07:00
Dianne Hackborn
7510aba7a5 am 896b15ab: Merge change 27016 into eclair
Merge commit '896b15abea4e1c0ee98330964474672a7316ee50' into eclair-plus-aosp

* commit '896b15abea4e1c0ee98330964474672a7316ee50':
  A variety of work on animations.
2009-09-25 00:57:27 -07:00
Dianne Hackborn
3b3e145d3c A variety of work on animations.
- The lock screen now fades in and out.
- Fixed a bug where we would accidentally freeze the screen when switching
  to an activity with a different orientation than the current (but
  the screen itself is in the current orientation).  This would mess up
  the animations on the car dock.
- New API to force a particular animation for an activity transition
  (untested).
- New wallpaper animations.
- Resources now uses the next API version when in a development build,
  to help applications being developed against such builds.

Change-Id: I2d9998f8400967ff09a04d693dc4ce55f0dbef5b
2009-09-25 00:48:02 -07:00
Mike Cleron
f45076dd37 am fdf53a46: Merge change 26935 into eclair
Merge commit 'fdf53a4628f915203752660aa07049aa22c01b5a' into eclair-plus-aosp

* commit 'fdf53a4628f915203752660aa07049aa22c01b5a':
  Fix bug 2129190
2009-09-24 21:54:03 -07:00
Android (Google) Code Review
fdf53a4628 Merge change 26935 into eclair
* changes:
  Fix bug 2129190 The context used by the status bar (i.e., the system context) was not properly initialized to have the right ApplicationInfo inside its PackageInfo. This eventually caused it to believe that it was running at 160dpi.
2009-09-25 00:45:23 -04:00
Mike Cleron
432b713c94 Fix bug 2129190
The context used by the status bar (i.e., the system context) was
not properly initialized to have the right ApplicationInfo inside
its PackageInfo. This eventually caused it to believe that it
was running at 160dpi.

Kudos to Dianne for figuring this out.
2009-09-24 21:41:19 -07:00
Nick Pelly
a7e508eb55 am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Merge commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b' into eclair-plus-aosp

* commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.
2009-09-24 19:47:03 -07:00
Nick Pelly
18b1e79a12 Bluetooth API: Do not allow apps to programmatically make BT discoverable.
Instead add ACTION_REQUEST_DISCOVERABLE for the system to show a dialog to
adjust discoverable mode.

Also remove createBond(), removeBond() and cancelBondProcess(). The Settings
App already handles these automatically when connections require bonding.

Change-Id: I216154cd1b6de410de64ba91b07d7263ac03e8df
2009-09-24 19:34:54 -07:00
Mike LeBeau
0406eb00f2 Clobber frameworks/base/core/java/android/speech in master with the
one in eclair.
2009-09-24 17:32:26 -07:00
Fred Quintana
63344cae94 am 91a00d3a: fix typo
Merge commit '91a00d3a421868ad06441f131eaca8fcbbbb4fa1' into eclair-plus-aosp

* commit '91a00d3a421868ad06441f131eaca8fcbbbb4fa1':
  fix typo
2009-09-24 16:54:19 -07:00
Fred Quintana
5dfe9f157c am f5808415: rename misc to birthday
Merge commit 'f5808415263d687eb125535e04ba374e33b785da' into eclair-plus-aosp

* commit 'f5808415263d687eb125535e04ba374e33b785da':
  rename misc to birthday
2009-09-24 16:54:13 -07:00
Fred Quintana
91a00d3a42 fix typo 2009-09-24 16:45:37 -07:00
Fred Quintana
f580841526 rename misc to birthday 2009-09-24 16:39:17 -07:00
Daisuke Miyakawa
2f24ab9fdc am 4579ed28: Merge change 26944 into eclair
Merge commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99' into eclair-plus-aosp

* commit '4579ed287a0f6fc32fbfefdd5c7cf69491fdae99':
  Add "TYPE=" to type attribute when appropriate.
2009-09-24 16:38:52 -07:00
Android (Google) Code Review
4579ed287a Merge change 26944 into eclair
* changes:
  Add "TYPE=" to type attribute when appropriate.
2009-09-24 19:31:20 -04:00
Wei Huang
8feefb3e20 am d35db5ec: Merge change 26946 into eclair
Merge commit 'd35db5ec8bd5ef07840fa84318284df04a69411c' into eclair-plus-aosp

* commit 'd35db5ec8bd5ef07840fa84318284df04a69411c':
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
2009-09-24 16:19:52 -07:00
Android (Google) Code Review
d35db5ec8b Merge change 26946 into eclair
* changes:
  Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
2009-09-24 19:13:30 -04:00
Daisuke Miyakawa
ccca121ecd Add "TYPE=" to type attribute when appropriate.
Internal issue number: 2142140
2009-09-24 15:52:40 -07:00
Wei Huang
ed16d4b7de Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
Change-Id: I0aad5b3d2834695b44cbb63e40c43a2159b723d9
2009-09-24 15:04:01 -07:00
Daisuke Miyakawa
5b7749845e am b7e89e4c: Merge change 26912 into eclair
Merge commit 'b7e89e4cdc4d0e769244b2ceaf9077359843de13' into eclair-plus-aosp

* commit 'b7e89e4cdc4d0e769244b2ceaf9077359843de13':
  Add appendType() utility method.
2009-09-24 15:01:05 -07:00
Nicolas Roard
08228fdaff am dccf22dc: Merge change 26698 into eclair
Merge commit 'dccf22dcea384e65ae54456122b5c660e6fefe00' into eclair-plus-aosp

* commit 'dccf22dcea384e65ae54456122b5c660e6fefe00':
  Fix the shortcuts
2009-09-24 14:41:31 -07:00
Daisuke Miyakawa
7497b78c56 Add appendType() utility method.
Some fix toward coll history related code is included.
2009-09-24 14:41:23 -07:00
Bryan Mawhinney
cbafa09444 am dfb7bc8c: Merge change 26821 into eclair
Merge commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb' into eclair-plus-aosp

* commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb':
  Make removeOnAccountsUpdateListener cope with null handlers.
2009-09-24 14:38:58 -07:00
Android (Google) Code Review
dccf22dcea Merge change 26698 into eclair
* changes:
  Fix the shortcuts
2009-09-24 17:35:11 -04:00
Fred Quintana
93bc8cab98 am 531e580a: remove the incorrectly located nickname
Merge commit '531e580ab160864e4152f431eaeb965676c58d19' into eclair-plus-aosp

* commit '531e580ab160864e4152f431eaeb965676c58d19':
  remove the incorrectly located nickname
2009-09-24 14:31:43 -07:00
Grace Kloba
9f9a0ad574 am f4a36e86: Merge change 26909 into eclair
Merge commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e' into eclair-plus-aosp

* commit 'f4a36e86bb4d1e15652dfd28236150c7f917866e':
  Not all WebView's host have permission to read the history.
2009-09-24 14:31:38 -07:00
Android (Google) Code Review
dfb7bc8c87 Merge change 26821 into eclair
* changes:
  Make removeOnAccountsUpdateListener cope with null handlers.
2009-09-24 17:29:53 -04:00
Fred Quintana
531e580ab1 remove the incorrectly located nickname 2009-09-24 14:27:41 -07:00
Android (Google) Code Review
f4a36e86bb Merge change 26909 into eclair
* changes:
  Not all WebView's host have permission to read the history. Add a security catch and return an empty list.
2009-09-24 17:24:40 -04:00
Grace Kloba
db674fb4e8 Not all WebView's host have permission to read the history.
Add a security catch and return an empty list.

We don't use tab in the code.

Fix http://b/viewIssue?id=2144339
2009-09-24 14:24:13 -07:00