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.
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
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.
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.
Merge commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be' into eclair-plus-aosp
* commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be':
Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
Merge commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f' into eclair-plus-aosp
* commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f':
Set roaming based on both data and voice.
If we don't have a uri/email/phone then we do not display the normal
fast track badge. But in that case we now have an alternate background/border
rather than no background/border.
Merge commit '9f9ce253648ad9dda16ae2fd3131073fe5643536' into eclair-plus-aosp
* commit '9f9ce253648ad9dda16ae2fd3131073fe5643536':
Fix the reporting of ActiveApnTypes on CDMA
