Commit Graph

3470 Commits

Author SHA1 Message Date
Dianne Hackborn
e42ed5fb1b am 05eeeace: Merge change 27178 into eclair
Merge commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45' into eclair-plus-aosp

* commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
2009-09-25 17:28:04 -07:00
Android (Google) Code Review
05eeeacee6 Merge change 27178 into eclair
* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
2009-09-25 20:19:59 -04:00
Dianne Hackborn
c1e605eff4 Fix issue #2136448: googleapps crashes while adding 2nd gmail account
Change-Id: I1dc27959650643bf0c7fd0564719856d7b3efeb1
2009-09-25 17:18:15 -07:00
Dianne Hackborn
7bae17c6de am 48c84052: Merge change 27162 into eclair
Merge commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af' into eclair-plus-aosp

* commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af':
  Fix Activity.overridePendingTransition().
2009-09-25 16:21:02 -07:00
Android (Google) Code Review
48c84052e2 Merge change 27162 into eclair
* changes:
  Fix Activity.overridePendingTransition().
2009-09-25 19:11:43 -04:00
Fred Quintana
abd4d965db am 6ecaff15: add a optional String to the key of notifications to allow users to scope them
Merge commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544' into eclair-plus-aosp

* commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544':
  add a optional String to the key of notifications to allow users
2009-09-25 16:11:40 -07:00
Dianne Hackborn
8b571a817c Fix Activity.overridePendingTransition().
Change-Id: I4ce995bd58efbbedbe4d0d1e9e0d0f4a8e261843
2009-09-25 16:09:43 -07:00
Fred Quintana
6ecaff1583 add a optional String to the key of notifications to allow users
to scope them
2009-09-25 16:01:22 -07:00
Daisuke Miyakawa
d4e21df961 am 3ed05574: Merge change 27077 into eclair
Merge commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb' into eclair-plus-aosp

* commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb':
  Two changes toward vCard composer.
2009-09-25 14:08:45 -07:00
Android (Google) Code Review
3ed05574e3 Merge change 27077 into eclair
* changes:
  Two changes toward vCard composer.
2009-09-25 17:02:05 -04:00
Grace Kloba
be3abd7334 am 0f5fd893: Merge change 27052 into eclair
Merge commit '0f5fd893bed202e90617a36bd4ca4211d667c320' into eclair-plus-aosp

* commit '0f5fd893bed202e90617a36bd4ca4211d667c320':
  If WebCore doesn't response touch down in time, don't
2009-09-25 13:44:48 -07:00
Daisuke Miyakawa
21ac410319 Two changes toward vCard composer.
- Separate the two cases: mCursor == null and mCursor.getCount() == 0.
- Make error messages viewable from user applications, which enables them to
  translate those messages.

Internal issue number: 2138187, 27103
2009-09-25 13:30:23 -07:00
Grace Kloba
f58af62211 If WebCore doesn't response touch down in time, don't
block the UI tap, pan and double tap. Added a time out
(which is same as shortpress time out, 200ms) for how
long we wait for WebCore's response for touch down.

This should fix the problem where pan/touch is not working
all the time when Flash plugin is installed.

Fix http://b/issue?id=2144761
2009-09-25 12:06:08 -07:00
Brad Fitzpatrick
0623e674d9 am 3219ab4d: Fix typo in Bluetooth docs.
Merge commit '3219ab4de27cd40b2149b0dd13edd412efe40244' into eclair-plus-aosp

* commit '3219ab4de27cd40b2149b0dd13edd412efe40244':
  Fix typo in Bluetooth docs.
2009-09-25 10:49:09 -07:00
Brad Fitzpatrick
3219ab4de2 Fix typo in Bluetooth docs. 2009-09-25 20:28:02 +04:00
Cary Clark
6fb27c5a68 am 96cfad5d: check for null before calling native webkit from java webview
Merge commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5' into eclair-plus-aosp

* commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5':
  check for null before calling native webkit from java webview
2009-09-25 09:14:27 -07:00
Cary Clark
96cfad5d67 check for null before calling native webkit from java webview
fixes http://b/issue?id=2121684
2009-09-25 12:06:20 -04: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
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
Daisuke Miyakawa
ccca121ecd Add "TYPE=" to type attribute when appropriate.
Internal issue number: 2142140
2009-09-24 15:52:40 -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
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
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
Dmitri Plotnikov
7f8d14e832 am 6938bb36: Fixing the broken build
Merge commit '6938bb36b8992420ec5cb392706a8bc192b332c1' into eclair-plus-aosp

* commit '6938bb36b8992420ec5cb392706a8bc192b332c1':
  Fixing the broken build
2009-09-24 14:11:55 -07:00