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.
Merge commit 'ca1a265cc3a44590b685cad2d5d081565c684d83'
* commit 'ca1a265cc3a44590b685cad2d5d081565c684d83':
Dock event overrides SCREEN_ORIENTATION_NOSENSOR so Home will rotate in the car dock.
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.
Merge commit '5ef75b68fe6ed46213e3499910f389d2c6fda85a' into eclair-plus-aosp
* commit '5ef75b68fe6ed46213e3499910f389d2c6fda85a':
make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
Merge commit '483a599c0330da087502b5b75bbe82fe8236cbec' into eclair-plus-aosp
* commit '483a599c0330da087502b5b75bbe82fe8236cbec':
Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
Use the set dialog height when the find dialog is up so that
found items at the bottom of the screen are scrolled into view.
This requires a companion change to set the dialog height in
the browser app.
Fixes http://b/issue?id=2122916
Merge commit 'cc36254b1639f40bcf4ed27855c1ef92faa89082'
* commit 'cc36254b1639f40bcf4ed27855c1ef92faa89082':
log hash of account name in sync event log
Merge commit 'b1ef743df3a436e04f61386151b962d210c6c2ac'
* commit 'b1ef743df3a436e04f61386151b962d210c6c2ac':
Use icon URI as icon cache key in search dialog
Merge commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1' into eclair-plus-aosp
* commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1':
log hash of account name in sync event log
Merge commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5' into eclair-plus-aosp
* commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5':
Use icon URI as icon cache key in search dialog
This is a minor optimization for the sake of the aggregator. The aggregator now relies on the display name
instead of structured components. As a result, we only need one column from the data table
for the structured name. For other data types it's data1. Might as well use the same column
for display name.
Change-Id: Ib22d1f1a7a91f12716d1a460e1578f01926c393a
1. Continous ringing after receiving a call waiting while in a call,
and before user answers the call waiting, the 1st call drops. If another
MT call comes in, while it rings, it also drops, the phone will keep
ringing.
2. Data call is not re-initiated if emergency MO call collides with an MT call.
Bug: 2123287
Change-Id: I6b12a900ec60b478691544ab5326eac4952ce834
