2818 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
85a2c7f1ca merge from open-source master 2009-09-01 11:46:14 -07:00
Eric Fischer
b7559e0280 am 56205fea: Merge change 23345 into donut
Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair

* commit '56205fea879543a50bb797016832416a8b48cabb':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 11:18:43 -07:00
Android (Google) Code Review
46c158234d Merge change 23105 into eclair
* changes:
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
2009-09-01 11:14:00 -07:00
Eric Laurent
4e059280b7 Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
Make sure that the progress bar is refreshed when the max value is changed.
2009-09-01 10:35:15 -07:00
Eric Fischer
a82e99a89b Fix an emoji-measuring bug that caused an exception when editing a contact.
It was measuring the text to try to determine the size that it needed to
scale the emoji character to.  Unfortunately it was accidentally trying
to measure the character under the cursor instead of the emoji character
itself, which is wrong, but more seriously doesn't work at all when the
cursor is at the end of the line.

This was already fixed before in change 144474, but that change never got
merged over to donut.  So this merges it now.

Bug 2087915

Change-Id: Ib4804d330a029a966207b3b07271f84e6b2652c0
2009-09-01 10:28:11 -07:00
Android (Google) Code Review
169ae05f9f Merge change 23439 into eclair
* changes:
  if exception getMessage() is null, don't add it to the error
2009-09-01 10:14:10 -07:00
Cary Clark
4e441b711a if exception getMessage() is null, don't add it to the error
Consolidate the error message construction, allowing the
exception getMessage() to fail.
2009-09-01 13:01:33 -04:00
Android (Google) Code Review
5e2a385c0d Merge change 23395 into eclair
* changes:
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
2009-09-01 09:15:45 -07:00
Android (Google) Code Review
05a6f3cde5 Merge change 23434 into eclair
* changes:
  Fix a docs comment to match the parameter name.
2009-09-01 07:20:18 -07:00
Patrick Scott
447811c64f Fix a docs comment to match the parameter name. 2009-09-01 09:57:20 -04:00
Cary Clark
278ce05b52 accelerate consecutive flings
Use the fact that the scroller keeps track of the current velocity
to accelerate subsequent flings. The current velocity is added to
the new velocity if the flings are in the same general direction
and if the fling animation hasn't been aborted.

This makes it easier to move to the top or bottom of very large
pages (either in overview mode or reading mode) by taking
consecutive flings as a cue from the user that they want to
page faster. The user can stop the fling with any action as
before.

fixes http://b/issue?id=2066090
2009-09-01 09:34:21 -04: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
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
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
Grace Kloba
ef32ee3db8 When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
So that the cache loading will not create a new mCacheResult which overwrites
the old cache data.
2009-08-31 18:43:48 -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
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
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
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
5ebe32deb5 disable canceling until the http connection code is understood 2009-08-30 22:49:05 -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
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
56f67d2145 add the ability to specify yieldpoints in a ContentProviderOperation 2009-08-28 17:01:16 -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
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
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
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
e9df3cf79c resolved conflicts for merge of 1e348378 to eclair 2009-08-27 23:54:12 -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
Fred Quintana
5c7aede8d6 allow delaying after yielding 2009-08-27 21:43:35 -07:00
Fred Quintana
fae7ff106b - don't schedule syncs that we will never dispatch
- expedite the INITIALIZATION sync
2009-08-27 21:32:08 -07:00
Fred Quintana
c298a8518a add an accessor for Context for use by subclasses 2009-08-27 20:02:10 -07:00
Android (Google) Code Review
1e3483780c Merge change 23043 into donut
* changes:
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-27 18:32:27 -07:00
Karl Rosaen
590f63433c Revert "Remove third party support for Quick Search Box (aka global search)."
This reverts commit a647b7f29d65a7792cede74284e714b591337992.
2009-08-27 17:42:48 -07:00
Android (Google) Code Review
a640c49eda Merge change 22984 into eclair
* changes:
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:18:14 -07:00
Grace Kloba
ce761d3219 Only add model in the UA for the release build 2009-08-27 15:24:59 -07:00
Fred Quintana
b19b4c711f fix AbstractThreadedSyncAdapter to actually cancel syncs 2009-08-27 14:43:01 -07:00
Android (Google) Code Review
6391830d10 Merge change 22958 into eclair
* changes:
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:31:06 -07:00