Merge commit '6351cf72a55def4e1bca5764dea8cbca99f13b90'
* commit '6351cf72a55def4e1bca5764dea8cbca99f13b90':
add hashCode() and equals() to Rfc822Token, as well as a convenience tokenizer method to Rfc822Tokenizer, as part of a calendar guest bugfix.
Merge commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa'
* commit '307ad592b8aa5d9246f7db4f8f1f8faafbe5eafa':
invalidate the webview after pressing the IME 'next' button
Merge commit '3219ab4de27cd40b2149b0dd13edd412efe40244' into eclair-plus-aosp
* commit '3219ab4de27cd40b2149b0dd13edd412efe40244':
Fix typo in Bluetooth docs.
Merge commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5' into eclair-plus-aosp
* commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5':
check for null before calling native webkit from java webview
Merge commit '2fd4943847d0209bef39171c1278ad6c86072dcc'
* commit '2fd4943847d0209bef39171c1278ad6c86072dcc':
Provide a getter to access the width of the HTML document.
Merge commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6'
* commit 'c3bfa6048da74dd54f9147f6600ad0537cbe7bd6':
add definition for Mms.TempStorage content uri and filename.
Merge commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8'
* commit 'ea2aabf1b21f756f06b0b7535c80807d986683d8':
Move destroying the web view to the WVC thread (previously it was on the UI thread)
Merge commit '90c0d0ab42ec909290abcc168ac0deded05a1141'
* commit '90c0d0ab42ec909290abcc168ac0deded05a1141':
In calcOurContentVisibleRect, account for the visible title bar.
Merge commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2'
* commit 'e7244b0482f6bdb21fc27aca078372333d0de5a2':
Back button in search always goes back or closes search
Merge commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a'
* commit '8f0d64693e155b1db2ff89cde1f050b4b6b0ec7a':
Fix bug where onStartCommand() was never called with a null intent.
Merge commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1'
* commit 'f73afeeec3d4c841207ffc4e5415b8fe4555a5a1':
fix the logic for starting a sync after the accounts changed
Merge commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c'
* commit 'd5b16418ed7dcdeeba108bad0e4c78ef25ded52c':
- make an AccountManager per context, not one per process
Merge commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86'
* commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86':
Dock screen on config can now select AC or USB.
Merge commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3'
* commit '2b0d6e7e43f92b1fb1dea207b3eb4121369594c3':
Add support for thumbnails to WallpaperInfo.
Merge commit '7ca38352b911bfd299f5862da930e388eba7f903'
* commit '7ca38352b911bfd299f5862da930e388eba7f903':
Setting the default HTTP user agent at runtime init.
Merge commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc' into eclair-plus-aosp
* commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc':
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
Merge commit '3e2ac8843489e83c4171aabcfe98769b5159a5c8' into eclair-plus-aosp
* commit '3e2ac8843489e83c4171aabcfe98769b5159a5c8':
Fix/improve issue #2142662: too easy to click a link/item instead of fling
Merge commit '896b15abea4e1c0ee98330964474672a7316ee50' into eclair-plus-aosp
* commit '896b15abea4e1c0ee98330964474672a7316ee50':
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
* 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.
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.
Merge commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe' into eclair-plus-aosp
* commit '1a42cfac152faa98c2e3d9e9fd6889209de195fe':
Use LM_SECURE when auth && encrypt.
Merge commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b' into eclair-plus-aosp
* commit '18b1e79a123b979d25bfa5d0b0ee5d0382dbd64b':
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
Merge commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d' into eclair-plus-aosp
* commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d':
Fix 2101425: Camera crashes spontaneously in preview.