merge in ics-release history after reset to master
Merge "Remove cancel button from display- and sort-order dialogs."
am abed2cad: Merge "Remove cancel button from display- and sort-order dialogs."

* commit 'abed2cadde0fae8e146275f40c5bc45d297d7a21':
  Remove cancel button from display- and sort-order dialogs.
merge in ics-release history after reset to master
Show correct Toast for search button.

Bug: 5841089
Change-Id: Ib062ab04bfd65499a886f47b788030432d738d51
Fix gap above overscroll indicator in quick-contacts.

There is a 1-pixel gap between the list and the quick-contact
"track".  It looks a bit like a shadow and adds a bit of depth
to the track, but the resulting gap is an eyesore.  The simple
fix is to remove the gap.

Bug: 5748071
Change-Id: Id29c7d359364d28dac8ff17d732b4c80d3388e2d
Merge "Fix gap above overscroll indicator in quick-contacts."
am e347bd90: Show correct Toast for search button.

* commit 'e347bd90b83834dd8ba70ebea9e255baf061e9c5':
  Show correct Toast for search button.
am 66ecc065: Merge "Fix gap above overscroll indicator in quick-contacts."

* commit '66ecc06533dc723954fabebea8edfa4a8d56f40a':
  Fix gap above overscroll indicator in quick-contacts.
merge in ics-release history after reset to master
Use query parameters for account filter...

for the phone list and the contacts list.

The use of account query parameters with the "/contacts" URI requires
the provider side change I12e11168.

Note: "contacts to display" doesn't benefit from account_ID yet.  We need
to add a new URI for this.

Change-Id: I7ed72d65125d2aa8b691af0196b04a5f611de5cf
Small code cleanup aronud DialpadFragment

- use @Override to interface methods
- use private/final when possible

Change-Id: Icbcb66a3e72de16e9369fdfeac62b87d0b5d186d
am 89f0071f: Small code cleanup aronud DialpadFragment

* commit '89f0071ff9878d75561f1132d6dd03b07fa860c8':
  Small code cleanup aronud DialpadFragment
Fix for crash in contact card with null group name

Also supress showing "null" on the group editor.

Bug 5698683
Bug 5847463

Change-Id: I25bf497e719e2beed4fac32a2913a65022fe8fc7
Let numeric buttons rely more on touch-down on dialpad

This change lets the dialpad shows tentative digit during touch-down.
Because of some other problems we're still using touch-up for
emitting DTMF sound.

TESTED:
- Call usual phone numbers
- Try basic swipe and see a tentative number is erased
-- (e.g. Press '5' and start swiping, seeing '5' being erased during
    the horizontal swipe). User should not hear DTMF sound.
- Try Voicemail by long-pressing '1'.
- Try entering '+' by long-pressing '0'. It should remove tentative
  '0'.

Bug: 5749440
Change-Id: Id5332e643a6476efceb044f7d372118ffdc77377
Merge "Fix for crash in contact card with null group name"
Merge "Let numeric buttons rely more on touch-down on dialpad"
am fd0aa36f: Merge "Fix for crash in contact card with null group name"

* commit 'fd0aa36fcabe822f71105d7d0d0125ce01994a5d':
  Fix for crash in contact card with null group name
Cherry-picking I25bf497e for MR1

Fix for crash in contact card with null group name

Also supress showing "null" on the group editor.

Bug 5698683
Bug 5847463

Change-Id: I25bf497e719e2beed4fac32a2913a65022fe8fc7
am 9abfa169: Merge "Let numeric buttons rely more on touch-down on dialpad"

* commit '9abfa16911d5f088d81166c5e8dc832f22ffafc2':
  Let numeric buttons rely more on touch-down on dialpad