diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-04 19:28:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-04 19:28:30 +0000 |
commit | 4a0bf0749203eaa4509bedc55efbcc9a191a0b42 (patch) | |
tree | 6b417757830b1c4603ba28250c111693cb4d0b7c /java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java | |
parent | dd18cb13307866ec723992b327d1f6061b326313 (diff) | |
parent | 2cc1bfc10ab390d44c2fe7280cae787655ca8fcc (diff) |
Merge changes I481fbbc7,I57e48b5d,Ieb52489b,I2763ddd9
* changes:
Translation tweaks.
Migrated context menu to be a PopupMenu instead.
Add column for call mapping id to AnnotatedCallLog database.
Don't force open keyboard when RTT is active.
Diffstat (limited to 'java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java')
-rw-r--r-- | java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java b/java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java index 731c8c641..365b88f8c 100644 --- a/java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java +++ b/java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java @@ -234,16 +234,29 @@ public abstract class SpeedDialUiItem { */ @Nullable public Channel getDefaultVoiceChannel() { - if (defaultChannel() != null && !defaultChannel().isVideoTechnology()) { - return defaultChannel(); - } - if (channels().size() == 1) { // If there is only a single channel, it must be a voice channel as per our defined // assumptions (detailed in comments on method channels()). return channels().get(0); } + if (defaultChannel() == null) { + return null; + } + + if (!defaultChannel().isVideoTechnology()) { + return defaultChannel(); + } + + // Default channel is a video channel, so find it's corresponding voice channel + Channel prevChannel = channels().get(0); + for (int i = 1; i < channels().size(); i++) { + Channel currentChannel = channels().get(i); + if (currentChannel.equals(defaultChannel())) { + return prevChannel; + } + prevChannel = currentChannel; + } return null; } |