Merge commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449' into eclair-plus-aosp
* commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449':
When manually setting the uri pass it through to the badge widget.
Merge commit '9aa0005e24e4da8004317cd1f632afb567c50ca1'
* commit '9aa0005e24e4da8004317cd1f632afb567c50ca1':
Update getDisplayLabel() API to support new types.
Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp
* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
Update getDisplayLabel() API to support new types.
We recently added several new phone types, and this change
updates the API that resolves thoses types to strings. It
also uses unique string resources for each type, instead of
relying on types to be <string-array> indexes.
Fixes http://b/2118886
Merge commit 'd4644471db5b8b47fa03d099e3efbf69e170d292'
* commit 'd4644471db5b8b47fa03d099e3efbf69e170d292':
Reset backup tracking in response to transport data-wipe notification
Merge commit 'a25ab813c4ebcac876209e026ec7aef4588d77a3'
* commit 'a25ab813c4ebcac876209e026ec7aef4588d77a3':
Make scrolling textfields work better in the browser.
Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp
* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
Reset backup tracking in response to transport data-wipe notification
Merge commit 'd3997e556eb0509248c72b668c2cd955b7842b55' into eclair-plus-aosp
* commit 'd3997e556eb0509248c72b668c2cd955b7842b55':
Make scrolling textfields work better in the browser.
The touch slop seems to be too large for scrolling
a small textfield, so use a smaller number. Also,
in WebView, create viewToContentDimension, and use
it for determining the scroll position of the text
field.
Partial fix for http://b/issue?id=2133049
Change-Id: I0ded3be264b179bad39301e6adce86851b649a42
Merge commit '2aefa41a64281f04e469a2ac53b43d04d5c8932d'
* commit '2aefa41a64281f04e469a2ac53b43d04d5c8932d':
Always interpret (0,0) scrolls as top of title bar.
Merge commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe' into eclair-plus-aosp
* commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe':
Always interpret (0,0) scrolls as top of title bar.
Merge commit '3242cbbf82b515397151522d0a6228403e9eec23' into eclair-plus-aosp
* commit '3242cbbf82b515397151522d0a6228403e9eec23':
Make background color pure black.
Move the specialized code in NEW_PICTURE_MSG_ID to
setContentScrollTo so that a scroll to (0,0), whether
a result of a NEW_PICTURE_MSG_ID or from an initial
layout (or otherwise) is treated as scrolling to the
top of the content, including showing the title bar.
Scrolls to (0,1) will trigger code that animates the
title bar off screen.
Change-Id: Ia6db6d4620dea2bfe62407c4394a8ead38501b2f
Merge commit '4d9a5cc45c723d507f360d8e2339dbcb17ea2253'
* commit '4d9a5cc45c723d507f360d8e2339dbcb17ea2253':
Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp
* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
When attempting a backup, the transport may inform us that the backend is in an
uninitialized state. This typically means that the device's data has been wiped
after a period [e.g. 90 days] of inactivity. This means that we need to
re-store all data subject to backup, and all of our incremental state tracking
on the device is now stale.
In response, we wipe all of our recorded backup state and restart the backup
pass on all participants.
Merge commit 'a39a17d7a5e49150a778132809b9a8540a5fbe01'
* commit 'a39a17d7a5e49150a778132809b9a8540a5fbe01':
Uri encode phone number before passing it to query.
Merge commit '9da7d5476c476dbe13cdabe21b560c368a0aef56'
* commit '9da7d5476c476dbe13cdabe21b560c368a0aef56':
make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
Merge commit 'c1ddb155b86a916b5e0c712493949c582ab495c2'
* commit 'c1ddb155b86a916b5e0c712493949c582ab495c2':
Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
Merge commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2' into eclair-plus-aosp
* commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2':
Add a tip toast for double tap.
Merge commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f' into eclair-plus-aosp
* commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f':
Uri encode phone number before passing it to query.
