Merge commit '91c6bdd20365a5c6d33986cb941aa085864d016e' into eclair-plus-aosp
* commit '91c6bdd20365a5c6d33986cb941aa085864d016e':
Simplify the layout of all activities with a title and a progress bar.
Merge commit '92f0370cf09ef835c72099864fe7c0e7b7389877' into eclair-plus-aosp
* commit '92f0370cf09ef835c72099864fe7c0e7b7389877':
Fix disabled text color in choice dialogs.
Merge commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c' into eclair-plus-aosp
* commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c':
Fix for 2137900: Be more conservative about poking the wakelock.
Merge commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57' into eclair-plus-aosp
* commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57':
Prevent NPE when doing a fillSpecific layout.
Merge commit 'de04cb810f47c679583767df78f8490d96d310d1' into eclair-plus-aosp
* commit 'de04cb810f47c679583767df78f8490d96d310d1':
Add Gservices flag for Vending doctor download complete timeout.
Merge commit 'b80fbd4479dccbd2f3ab9645b49e41ca4d10371f' into eclair-plus-aosp
* commit 'b80fbd4479dccbd2f3ab9645b49e41ca4d10371f':
New assets for the status and title bars.
Merge commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c' into eclair-plus-aosp
* commit 'ac35dc4716a448734493d939a1cb5af4d03cf41c':
Implement the checkin option in AccountManagerService.dump()
Merge commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39' into eclair-plus-aosp
* commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39':
border for the non-badge case
Merge commit 'c78b2bf474623eaa83ef517c4d648aa6595b8575' into eclair-plus-aosp
* commit 'c78b2bf474623eaa83ef517c4d648aa6595b8575':
New hdpi assets for framework.
With this change, the vCard composer does not emit any information
about CHARSET until it is really needed for parsing it (e.g. when
non-ascii chacacters are included in some value). This "may" be
effective toward external vCard importers which are not able to
understand non-ascii characters and CHARSET info itself.
Also now vCard composer does not use Quoted Printable until it is
really needed (e.g. until when the composer find non-"7bit"
characters are included in some value. "7bit" is defined in vCard 2.1,
which is "<7bit us-ascii printable chars, excluding CR LF>".
The vCard composer detects duplicate phone numbers, email addresses,
and remove them in default. The duplication would come from
aggregation done by the new ContactsProvider introduced in Eclair.
Even when two Accounts have two exactly same addresses, we cannot
ask ContactsProvider to exclude them since current implementation of
ContactsProvider2#queryEntities() does not acceps Contacts.CONTENT_URI
but only RawContacts.CONTENT_URI, which inevitably returns same
email addresses with different Accounts (ACCOUNT_NAME and ACCOUNT_TYPE
should be different. If not, the original contact itself should have
the duplication).
The vCard composer now detects null returned from queryEntities().
The null value is potentially harmful for vCard file, since it forces
the (old) vCard composer to emit meaningless line like "BDAY:".
Internal Issue number: 2150768, 2151954, 2154235
Merge commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e' into eclair-plus-aosp
* commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e':
check for null item in web history in saveState
When the dump is requested by the checkin server the AccountManagerService will now dump each account type and the number accounts that are registered/active for that account type.
Merge commit 'eaa18dec91b6dd0ce3191a9ab65cdc95ef68b935' into eclair-plus-aosp
* commit 'eaa18dec91b6dd0ce3191a9ab65cdc95ef68b935':
scroll text field with touch
Add a hidden public method to text/method/Touch.java that
computes the maximum scroll amount for a text field.
Remove 'faketouch' code; it causes a crash and is
no longer required.
Pass the percentage of the current scroll from the UI
thread to webkit. One additional fix is to allow very
small movements which are currently disallowed because
they are smaller than 'smallerSlop' in WebTextView.java.
Companion fix is in external/webkit.
Fixes http://b/issue?id=2133049
Merge commit 'f993fefc3b14ece3f0f3eac6bb3d241bffb3cdfb' into eclair-plus-aosp
* commit 'f993fefc3b14ece3f0f3eac6bb3d241bffb3cdfb':
EventLog when a database file is deleted due to corruption.
Merge commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea' into eclair-plus-aosp
* commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea':
Allow scrolls to continue when getting a new content size.
In recordNewContentSize, rather than aborting any scrolls in progress,
find the final coordinates of the scroll and pin them to the new size,
and let the scroll continue.
Fixes http://b/issue?id=2141960
Change-Id: I7bfa444b52e70a0ca817221f379df77efc3496b7
Merge commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a' into eclair-plus-aosp
* commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a':
Clean up cacheColorHint to be better controlled by the theme.
