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 'ab18206e209e1ef019c2837856ff53c635d3032f' into eclair-plus-aosp
* commit 'ab18206e209e1ef019c2837856ff53c635d3032f':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e' into eclair-plus-aosp
* commit '4fbf81bc94f38a630de49445e3eb4880289c6a6e':
check for null item in web history in saveState
* changes:
Fix some metadata retriever issues: 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource. mRetriever won't be initialized until data source is set; thus we have to do this
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
1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource
2. cached the mode so that setMode can still be called before setDataSource.
mRetriever won't be initialized until data source is set; thus we have to do this
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 '87937ae89e77c804b1b3c8fcc3d4225fa99390b7' into eclair-plus-aosp
* commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7':
Whoops, these shouldn't be public.
Merge commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea' into eclair-plus-aosp
* commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea':
Allow scrolls to continue when getting a new content size.
Ummmm... this turns out to be pretty bad. NinePatchDrawable was not
scaling its reported padding for compatibility mode, causing spacing
to be off. All over the place. This change should improve things quite
a bit (and magically makes nearly all of the menu flaws go away).
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 '7d028a0a974fdee240cac7118bf47c96777ea533'
* commit '7d028a0a974fdee240cac7118bf47c96777ea533':
Separate API for vCards through openAssetFileDescriptor().
Merge commit 'b74e2ac44c72c846095334fab7f60111c1271f34'
* commit 'b74e2ac44c72c846095334fab7f60111c1271f34':
Modify the "active chats" uri to not overlap with other uris.
Merge commit '0d6d171af20e52b529c6f42885a2aca70e3a5cef'
* commit '0d6d171af20e52b529c6f42885a2aca70e3a5cef':
Print out all available EGL configurations.
Merge commit '39433f818b223aab50b264fb43e8e32da1d8151a'
* commit '39433f818b223aab50b264fb43e8e32da1d8151a':
Do not crash appwdiget host when a pending intent send fails.
Merge commit 'c78f617bb66123c224c833ed2bd151d588a9a06d'
* commit 'c78f617bb66123c224c833ed2bd151d588a9a06d':
Disable keyguard while docked when the lock screen is insecure.
