Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp
* commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a':
Fixing a concurrency problem by changing the contact aggregation exception API.
The current API requires a contact_id and a raw_contact_id
There are at least two issues with this approach I did not recognize initially:
1. Contact_id may be changed asynchronously by aggregation or some other process.
2. A raw contacts may need to be added to an aggregate before the actual aggregation pass
has gotten to it, so the client would need to wait for the aggregation to complete
before it can set an aggregation exception. That's backwards.
Merge commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442'
* commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442':
Wallpapers: new transitions, hiding when not visible, other cleanup.
Merge commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5' into eclair-plus-aosp
* commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5':
Wallpapers: new transitions, hiding when not visible, other cleanup.
Merge commit '63aca6389ce803e469624779f9e723eea00e1dfc'
* commit '63aca6389ce803e469624779f9e723eea00e1dfc':
When zooming, do not draw the WebTextView. Resize it when done.
Merge commit '608f9f470fa562fc6a32449297110d4ec2953515' into eclair-plus-aosp
* commit '608f9f470fa562fc6a32449297110d4ec2953515':
When zooming, do not draw the WebTextView. Resize it when done.
Merge commit 'dce5b2ce0908be0ac53c89e6ab50b2e71735f924'
* commit 'dce5b2ce0908be0ac53c89e6ab50b2e71735f924':
Clean up from earlier changes to place title bar at top of WebView
Merge commit '3c32474f0e0df419135f1966796d277aba9ee7cb' into eclair-plus-aosp
* commit '3c32474f0e0df419135f1966796d277aba9ee7cb':
Clean up from earlier changes to place title bar at top of WebView
This is work on the transitions with wallpapers. There are now new
animations specifically for leaving the wallpaper and returning to
it, which allow us to have a consistent animation when entering home
and returning to it. I also renamed the existing animations across
wallpapers, and cleaned up some junk in the various interpolators.
This also now hides the wallpaper surface when it is not visible,
to get rid of the wallpaper flickers people complained about albeit
in a somewhat brutal way. :) (Though really returning us to the
previous behavior with the same previous bugs and name back to them
not being very visible, yay!) There is are also some bug fixes
here and there about managing the wallpaper visibility that this
change revealed.
Change-Id: I913990a9a81651728122ed2e1101b75ed2c36fcb
Merge commit 'c77b04d8684dd35beb3d67c29a101d549313df98'
* commit 'c77b04d8684dd35beb3d67c29a101d549313df98':
Don't toggle between in app and global search on repeat key events.
Merge commit '107039f94888fce212e0965b74971727d2b01b82' into eclair-plus-aosp
* commit '107039f94888fce212e0965b74971727d2b01b82':
Don't toggle between in app and global search on repeat key events.
Rename addTitleBar to setEmbeddedTitleBar. This requires a change
to packages/apps/Browser. Also remove mTitleBar if there already
was one.
In ViewManager, call contentToViewDimension where appropriate.
Change-Id: If4d378fad192990253411924a9a80bee96e63ff2
Merge commit '6b07d533f0f3fe49dd2070e3d4ff44eb804aee87'
* commit '6b07d533f0f3fe49dd2070e3d4ff44eb804aee87':
Some mobile sites, like m.www.yahoo.com, slashdot.org (iPhone version),
Merge commit '3c72fff035e287f9e0b9340cc3921896ca86380b' into eclair-plus-aosp
* commit '3c72fff035e287f9e0b9340cc3921896ca86380b':
Some mobile sites, like m.www.yahoo.com, slashdot.org (iPhone version),
have a bigger minPrefWidth than the screen width. So we don't want to force
the minZoomScale to be same as defaultScale. Otherwise we won't be able to
zoom out in these sites.
Fix http://b/issue?id=2090718
Merge commit '81c7192d335b7260914105578006ef662c3d641a'
* commit '81c7192d335b7260914105578006ef662c3d641a':
Do a better job at finding the activity associated with a dialog when triggering search.
Merge commit '93a751d6adc00cbc6fb564b27592fc5730a655ef' into eclair-plus-aosp
* commit '93a751d6adc00cbc6fb564b27592fc5730a655ef':
Do a better job at finding the activity associated with a dialog when triggering search.
Merge commit '71e0da0f238270254bb0e7cea3e3506cb5cfdb18'
* commit '71e0da0f238270254bb0e7cea3e3506cb5cfdb18':
Add more documents on the ACTION_SEND_MULTIPLE intent.
Merge commit '1e52988adc9e7b6136374d01e7537d756ac89f82' into eclair-plus-aosp
* commit '1e52988adc9e7b6136374d01e7537d756ac89f82':
Add more documents on the ACTION_SEND_MULTIPLE intent.
Merge commit 'e8853fc57093e781fa7c659c6eb4da3be9f8695a' into eclair-plus-aosp
* commit 'e8853fc57093e781fa7c659c6eb4da3be9f8695a':
also expose onDrawHorizontalScrollBar() in View
It first looks to see if there is an activity that is managing the dialog, and if not,
follows the context / contextwrapper chain to find an activity if possible.
Fixes http://b/issue?id=2064772.
Merge commit '3d031d2a19900474501650d555628fa3baf2b314'
* commit '3d031d2a19900474501650d555628fa3baf2b314':
Translate the content dimension to the view space before setting them to the view.
Merge commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b'
* commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b':
Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
Merge commit 'da32be5e06b9f02d0113b072de79276e16d19f50'
* commit 'da32be5e06b9f02d0113b072de79276e16d19f50':
Removing references to deprecated API and the deprecated API itself.
Merge commit 'e5b6d02f34af2cd81615653b00c96a421d5ea819' into eclair-plus-aosp
* commit 'e5b6d02f34af2cd81615653b00c96a421d5ea819':
Translate the content dimension to the view space before setting them to the view.
Merge commit '34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp
* commit '34619494e009d998f5c073145c0481e38bbd2bcf':
Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
