2875 Commits

Author SHA1 Message Date
Patrick Scott
7ef8e73b08 am d15dcf07: am 05c9ed9c: Fix the documentation for onReceivedError.
Merge commit 'd15dcf07adfa04a3b1ce41c3bcb9455314025264'

* commit 'd15dcf07adfa04a3b1ce41c3bcb9455314025264':
  Fix the documentation for onReceivedError.
2009-09-01 05:42:38 -07:00
Patrick Scott
05c9ed9ce1 Fix the documentation for onReceivedError.
This change adds the EventHandler error codes to WebViewClient for the public
api. Previously, the api was ambiguous about the value of the errorCode
parameter and falsely documented that the values are HTTP status codes.
2009-09-01 08:37:22 -04:00
Steve Block
4b5224bb64 am e2838c2a: am 0c637113: Merge change 23427 into eclair
Merge commit 'e2838c2a1637ca565efc561581d857923137ae3b'

* commit 'e2838c2a1637ca565efc561581d857923137ae3b':
  Moves GoogleLocationSettingManager to its correct location.
2009-09-01 05:27:04 -07:00
Android (Google) Code Review
0c63711338 Merge change 23427 into eclair
* changes:
  Moves GoogleLocationSettingManager to its correct location.
2009-09-01 05:23:26 -07:00
Steve Block
b599315910 Moves GoogleLocationSettingManager to its correct location.
This fixes bug http://b/issue?id=2089259.
2009-09-01 10:18:38 +01:00
Fred Quintana
664614cfa5 am 765f49e2: am 34b6a27e: Merge change 23375 into eclair
Merge commit '765f49e22d7dbf608710baa95e9769b9133d9483'

* commit '765f49e22d7dbf608710baa95e9769b9133d9483':
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
2009-08-31 18:55:36 -07:00
Android (Google) Code Review
34b6a27ea3 Merge change 23375 into eclair
* changes:
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
2009-08-31 18:51:04 -07:00
Romain Guy
6dbc11ca81 am 85655ebc: am 0f44220b: Merge change 23381 into eclair
Merge commit '85655ebcd9dc521e3c11209d24afee432d18b596'

* commit '85655ebcd9dc521e3c11209d24afee432d18b596':
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
2009-08-31 17:50:29 -07:00
Android (Google) Code Review
0f44220b34 Merge change 23381 into eclair
* changes:
  Prevent ListView from scrolling/flinging its content when the content fits on screen.
2009-08-31 17:46:47 -07:00
Romain Guy
6198ae8468 Prevent ListView from scrolling/flinging its content when the content fits on screen.
Change-Id: Id46313bca3ae53b0717cd74a4a6f889a01f9fcb1
2009-08-31 17:45:55 -07:00
Fred Quintana
2f20b04c14 am a27b7822: am ec5d9fb4: Merge change 23370 into eclair
Merge commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665'

* commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665':
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:29:03 -07:00
Fred Quintana
fcb14322f4 re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync() 2009-08-31 17:25:05 -07:00
Android (Google) Code Review
ec5d9fb47d Merge change 23370 into eclair
* changes:
  Revert "- don't schedule syncs that we will never dispatch"
2009-08-31 17:24:17 -07:00
Fred Quintana
c58b611652 Revert "- don't schedule syncs that we will never dispatch"
This reverts commit fae7ff106b3ed791e324ddcec17226c3fe1cd809.
2009-08-31 17:20:08 -07:00
Jaikumar Ganesh
5ba22e9e11 am 2ebf7793: am c91ad28f: Merge change 23218 into eclair
Merge commit '2ebf7793e42df72d4198461487f3bd73f17b32a4'

* commit '2ebf7793e42df72d4198461487f3bd73f17b32a4':
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:56:52 -07:00
Android (Google) Code Review
c91ad28ff9 Merge change 23218 into eclair
* changes:
  Fix property being cleared when DeviceFound signal is received.
2009-08-31 16:52:38 -07:00
Daisuke Miyakawa
69a776c27d am 78e9389a: am f66e2e24: Merge change 23344 into eclair
Merge commit '78e9389a213df93a2e1d55b9961ce8aa103e7301'

* commit '78e9389a213df93a2e1d55b9961ce8aa103e7301':
  Make vCard composer handle null of Photo entry correctly.
2009-08-31 16:45:56 -07:00
Daisuke Miyakawa
2d88dfaeed am 08271d05: am cedcb135: Merge change 23343 into eclair
Merge commit '08271d05e338b483b12fae0f52a9519677910176'

* commit '08271d05e338b483b12fae0f52a9519677910176':
  Use Email.TYPE_MOBILE
2009-08-31 16:45:51 -07:00
Fred Quintana
2f449b745b am 91800118: am 7cb08acc: Merge change 23066 into eclair
Merge commit '91800118a129bd63fc19e90da6b52c67036fa424'

* commit '91800118a129bd63fc19e90da6b52c67036fa424':
  - don't schedule syncs that we will never dispatch
2009-08-31 16:45:42 -07:00
Dmitri Plotnikov
11f79e449a am e266995b: am f35bce45: Adding a column to Contacts, which will be used as an additional "soft" identity.
Merge commit 'e266995bb15914b2e648901b379460953a1ff73b'

* commit 'e266995bb15914b2e648901b379460953a1ff73b':
  Adding a column to Contacts, which will be used as an additional "soft" identity.
2009-08-31 16:43:39 -07:00
Android (Google) Code Review
f66e2e249d Merge change 23344 into eclair
* changes:
  Make vCard composer handle null of Photo entry correctly.
2009-08-31 15:18:43 -07:00
Android (Google) Code Review
cedcb13547 Merge change 23343 into eclair
* changes:
  Use Email.TYPE_MOBILE
2009-08-31 15:18:28 -07:00
Daisuke Miyakawa
f75c94f7a9 Make vCard composer handle null of Photo entry correctly.
Internal bug id: 2088922
2009-09-01 07:17:20 +09:00
Android (Google) Code Review
7cb08accdd Merge change 23066 into eclair
* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync
2009-08-31 15:03:32 -07:00
Daisuke Miyakawa
ee0e24c105 Use Email.TYPE_MOBILE 2009-09-01 05:36:34 +09:00
Dmitri Plotnikov
f35bce4505 Adding a column to Contacts, which will be used as an additional "soft" identity.
The main consumer of this feature is shortcuts.

The LOOKUP KEY column will contain an encoded concatenation of the contact's row id
as well as sync_ids of all constituent raw contacts. It goes with the "contacts/lookup/*/#" URI.

When we get such a URI, we will first try to load the
contact with the specified _id and lookup_key.  If we cannot find the contact
that way, we will go scout for the contact that contains most of the sync_ids
we found in the lookup key.

We will need to make sure that the contact picker returns the lookup-style URIs.
2009-08-31 09:16:51 -07:00
Fred Quintana
712d9d5c2a am 46588ef2: am 66360af8: Merge change 23266 into eclair
Merge commit '46588ef200aec0f6dbc7c07b132d002039fbd45e'

* commit '46588ef200aec0f6dbc7c07b132d002039fbd45e':
  disable canceling until the http connection code is understood
2009-08-31 00:26:49 -07:00
Fred Quintana
5ebe32deb5 disable canceling until the http connection code is understood 2009-08-30 22:49:05 -07:00
Dianne Hackborn
10d73e0043 am 71562cc7: am 284ac93a: More work on wallpapers: animations, lifecycle, scaling, etc.
Merge commit '71562cc72d1d6be97297bb03b67c217a529ebec7'

* commit '71562cc72d1d6be97297bb03b67c217a529ebec7':
  More work on wallpapers: animations, lifecycle, scaling, etc.
2009-08-30 10:59:26 -07:00
Dianne Hackborn
284ac93aa3 More work on wallpapers: animations, lifecycle, scaling, etc.
Yet more work on improving the behavior of wallpapers.  This fixes a few
problems in their lifecycle (corresponding change in the picker also
required for this), makes their animations better for hardware that supports
alpha fades, adds animations for the wallpapers themselves, eliminates
fixed size wallpapers, and adjusts the API for retrieving a wallpaper
bitmap to take care of scaling the raw wallpaper image to match the current
desired width and height.

Change-Id: If1c0aaceba4ea4e175dcb7a8416ca7ddbb9bfa6f
2009-08-30 10:53:53 -07:00
Jeff Sharkey
2d5b9e861e am 11f6d90a: am cfff8f22: Merge change 23244 into eclair
Merge commit '11f6d90a4ece4fe9994819b8646e10168d3ff2c0'

* commit '11f6d90a4ece4fe9994819b8646e10168d3ff2c0':
  Add mobile Email type.
2009-08-29 15:59:04 -07:00
Jeff Sharkey
14fb153866 Add mobile Email type. 2009-08-29 15:54:26 -07:00
Jaikumar Ganesh
efa33676ca Fix property being cleared when DeviceFound signal is received. 2009-08-28 17:49:11 -07:00
Fred Quintana
598ec41b37 am 9b52ad61: am 56f67d21: add the ability to specify yieldpoints in a ContentProviderOperation
Merge commit '9b52ad61642c84f74c89627eeb28d03ebb44386c'

* commit '9b52ad61642c84f74c89627eeb28d03ebb44386c':
  add the ability to specify yieldpoints in a ContentProviderOperation
2009-08-28 17:06:18 -07:00
Fred Quintana
56f67d2145 add the ability to specify yieldpoints in a ContentProviderOperation 2009-08-28 17:01:16 -07:00
Mike LeBeau
efe2689081 am 779bdc38: am cc927375: am af0b780a: Merge change 23198 into donut
Merge commit '779bdc3850f656e34a5783f3db02ab40361a22b9'

* commit '779bdc3850f656e34a5783f3db02ab40361a22b9':
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:20:57 -07:00
Mike LeBeau
cc927375ce am af0b780a: Merge change 23198 into donut
Merge commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff' into eclair

* commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff':
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:15:58 -07:00
Mike LeBeau
05b775e0b7 Update SearchManager documentation to reflect latest behavior. 2009-08-28 15:52:56 -07:00
Charles Chen
db7fcd49ac am 932cb550: am e8e4c7e4: Merge change 23127 into eclair
Merge commit '932cb5507ec2e4249bafb9fa792e37dfa7629412'

* commit '932cb5507ec2e4249bafb9fa792e37dfa7629412':
  Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
2009-08-28 13:38:57 -07:00
Android (Google) Code Review
e8e4c7e4fa Merge change 23127 into eclair
* changes:
  Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
2009-08-28 13:34:38 -07:00
Charles Chen
85f6fb713f Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
exception if multiple accessibility services are running and there are
several events all happening within a short period of time.
2009-08-28 11:32:23 -07:00
Cary Clark
aca20da4a9 am a3811e1b: am 6d45accc: don\'t layout when setting size from zoom if only height changed
Merge commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c'

* commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c':
  don't layout when setting size from zoom if only height changed
2009-08-28 09:52:31 -07:00
Cary Clark
6d45accc71 don't layout when setting size from zoom if only height changed
(companion change in external/webkit)
Add a boolean parameter to WebViewCore.java nativeSizeSize().
If set, only layout if the width has also changed.
If clear, layout if the height alone has changed.
Layout is clear when called from zoom setup, and set otherwise.
2009-08-28 12:46:10 -04:00
Grace Kloba
29f2ca8096 am a297a266: am feb2b311: Merge change 22988 into eclair
Merge commit 'a297a266bdea9f64c6a548661aa4be540c69c676'

* commit 'a297a266bdea9f64c6a548661aa4be540c69c676':
  Only add model in the UA for the release build
2009-08-28 09:16:51 -07:00
Android (Google) Code Review
feb2b311c6 Merge change 22988 into eclair
* changes:
  Only add model in the UA for the release build
2009-08-28 09:12:28 -07:00
Mike LeBeau
b4758199dd am 8c0fa1a2: am e9df3cf7: resolved conflicts for merge of 1e348378 to eclair
Merge commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef'

* commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef':
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-28 00:02:41 -07:00
Mike LeBeau
e9df3cf79c resolved conflicts for merge of 1e348378 to eclair 2009-08-27 23:54:12 -07:00
Dianne Hackborn
0754e1fb34 am 554f6cb1: am 49237345: Add platform infrastructure for features.
Merge commit '554f6cb1c7433449257d07d57e3d36cacb48fc70'

* commit '554f6cb1c7433449257d07d57e3d36cacb48fc70':
  Add platform infrastructure for features.
2009-08-27 22:16:13 -07:00
Fred Quintana
54313453d5 am 820232af: am 5511c669: Merge change 23067 into eclair
Merge commit '820232af1b70bc20a24afedc7533a1068d733e64'

* commit '820232af1b70bc20a24afedc7533a1068d733e64':
  allow delaying after yielding
2009-08-27 21:52:34 -07:00
Dianne Hackborn
49237345d8 Add platform infrastructure for features.
This introduces a new mechanism to define features associated with
a platform, query the current device for the available features,
and enforce that apps requiring features that aren't available can't
be installed.

Also now allows uses-library to specify that a library is optional,
so the lack of such a library will not prevent the app from being
installed (but if it does exist it will be correctly linked into
the app).

Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
2009-08-27 21:51:00 -07:00