Merge "Fix some voicemail playback bugs" into mnc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf69358..2b0447d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -113,6 +113,12 @@
<data android:scheme="tel" />
</intent-filter>
<intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:mimeType="vnd.android.cursor.dir/calls" />
+ </intent-filter>
+ <intent-filter>
<action android:name="android.intent.action.CALL_BUTTON" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
@@ -145,12 +151,6 @@
android:label="@string/call_log_activity_title"
android:theme="@style/DialtactsThemeWithoutActionBarOverlay"
android:icon="@mipmap/ic_launcher_phone">
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
- <data android:mimeType="vnd.android.cursor.dir/calls" />
- </intent-filter>
</activity>
<activity android:name="com.android.dialer.CallDetailActivity"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7678a60..c6567e7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -187,7 +187,7 @@
<string name="sounds_and_vibration_title" msgid="1692290115642160845">"Sons et vibreur"</string>
<string name="accessibility_settings_title" msgid="6068141142874046249">"Accessibilité"</string>
<string name="ringtone_title" msgid="760362035635084653">"Sonnerie du téléphone"</string>
- <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibreur aussi pour les appels"</string>
+ <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Vibrer aussi pour les appels"</string>
<string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Son du clavier"</string>
<string name="dtmf_tone_length_title" msgid="8581125689808919460">"Durée de la tonalité du clavier"</string>
<string-array name="dtmf_tone_length_entries">
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c5eca32..d3c3908 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -187,7 +187,7 @@
<string name="sounds_and_vibration_title" msgid="1692290115642160845">"Hangok és rezgés"</string>
<string name="accessibility_settings_title" msgid="6068141142874046249">"Kisegítő lehetőségek"</string>
<string name="ringtone_title" msgid="760362035635084653">"Telefon csengőhangja"</string>
- <string name="vibrate_on_ring_title" msgid="3362916460327555241">"Rezgés a hívásoknál is"</string>
+ <string name="vibrate_on_ring_title" msgid="3362916460327555241">"A hívásoknál rezegjen is"</string>
<string name="dtmf_tone_enable_title" msgid="6571449695997521615">"Tárcsázó hangjai"</string>
<string name="dtmf_tone_length_title" msgid="8581125689808919460">"Tárcsázási hang hossza"</string>
<string-array name="dtmf_tone_length_entries">
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8b71559..1a0fee8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -126,7 +126,7 @@
<string name="call_not_available" msgid="8941576511946492225">"전화 애플리케이션을 사용 중지했으므로 전화를 걸 수 없습니다."</string>
<string name="activity_not_available" msgid="2287665636817987623">"이 기기에 작업을 처리할 수 있는 앱이 없습니다."</string>
<string name="dialer_hint_find_contact" msgid="1012544667033887519">"이름 또는 전화번호 입력"</string>
- <string name="recentMissed_empty" msgid="4901789420356796156">"부재중 통화 없음"</string>
+ <string name="recentMissed_empty" msgid="4901789420356796156">"부재중 전화 없음"</string>
<string name="recentVoicemails_empty" msgid="8582424947259156664">"최근 음성사서함 없음"</string>
<string name="show_favorites_only" msgid="5520072531022614595">"즐겨찾는 연락처만 표시"</string>
<string name="call_log_activity_title" msgid="4612824396355272023">"기록"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 980171e..b28c7ce 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -81,7 +81,7 @@
<string name="add_2sec_pause" msgid="9214012315201040129">"Tambah jeda 2 saat"</string>
<string name="add_wait" msgid="3360818652790319634">"Tambah penungguan"</string>
<string name="dialer_settings_label" msgid="4305043242594150479">"Tetapan"</string>
- <string name="menu_newContact" msgid="1209922412763274638">"Kenalan baru"</string>
+ <string name="menu_newContact" msgid="1209922412763274638">"Kenalan baharu"</string>
<string name="menu_allContacts" msgid="6948308384034051670">"Semua kenalan"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Butiran panggilan"</string>
<string name="toast_call_detail_error" msgid="6947041258280380832">"Butiran tidak tersedia"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4ca7a57..ff6da8e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -139,7 +139,7 @@
<string name="tab_voicemail" msgid="155024725947496746">"Voicemail"</string>
<string name="favorite_hidden" msgid="5011234945140912047">"Verwijderd uit favorieten"</string>
<string name="favorite_hidden_undo" msgid="2508998611039406474">"Ongedaan maken"</string>
- <string name="search_shortcut_call_number" msgid="7277194656832895870">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="search_shortcut_call_number" msgid="7277194656832895870">"<xliff:g id="NUMBER">%s</xliff:g> bellen"</string>
<string name="search_shortcut_create_new_contact" msgid="1679917465521554093">"Nieuw contact maken"</string>
<string name="search_shortcut_add_to_contact" msgid="4327842393369915751">"Toevoegen aan een contact"</string>
<string name="search_shortcut_send_sms_message" msgid="2569304043345025525">"Sms verzenden"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bcae633..1961dc0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -86,7 +86,7 @@
<string name="menu_allContacts" msgid="6948308384034051670">"Toată agenda"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Detaliile apelului"</string>
<string name="toast_call_detail_error" msgid="6947041258280380832">"Nu sunt disponibile detalii"</string>
- <string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Utilizaţi tastatura DTMF"</string>
+ <string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Tastatura tactilă cu sunet"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Reveniţi la apelul în curs"</string>
<string name="dialer_addAnotherCall" msgid="4205688819890074468">"Adăugaţi un apel"</string>
<string name="type_incoming" msgid="6502076603836088532">"Apel de intrare"</string>
@@ -142,7 +142,7 @@
<string name="favorite_hidden_undo" msgid="2508998611039406474">"Anulați"</string>
<string name="search_shortcut_call_number" msgid="7277194656832895870">"Apelați <xliff:g id="NUMBER">%s</xliff:g>"</string>
<string name="search_shortcut_create_new_contact" msgid="1679917465521554093">"Creați o intrare nouă"</string>
- <string name="search_shortcut_add_to_contact" msgid="4327842393369915751">"Adăugați la un contact"</string>
+ <string name="search_shortcut_add_to_contact" msgid="4327842393369915751">"Adăugați la o intrare"</string>
<string name="search_shortcut_send_sms_message" msgid="2569304043345025525">"Trimiteți SMS"</string>
<string name="search_shortcut_make_video_call" msgid="1265971685034465166">"Inițiați un apel video"</string>
<string name="show_call_history" msgid="1141502332266697170">"Vedeți istoricul complet al apelurilor"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 38e5644..e80174f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -50,7 +50,7 @@
<string name="call_log_incoming_header" msgid="2787722299753674684">"Только входящие звонки"</string>
<string name="call_log_outgoing_header" msgid="761009180766735769">"Только исходящие звонки"</string>
<string name="call_log_missed_header" msgid="8017148056610855956">"Только пропущенные звонки"</string>
- <string name="visual_voicemail_title" msgid="4574199312906348905">"Анимированная голосовая почта"</string>
+ <string name="visual_voicemail_title" msgid="4574199312906348905">"Визуальная голосовая почта"</string>
<string name="visual_voicemail_text" msgid="164967285234132509">"Просматривайте и прослушивайте голосовые сообщения без лишних звонков. Может взиматься плата за передачу данных."</string>
<string name="visual_voicemail_settings" msgid="8090338793118794741">"Настройки"</string>
<string name="voicemail_status_voicemail_not_available" msgid="5222480147701456390">"Не удается загрузить данные голосовой почты"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 78d0b48..33cc50d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -117,10 +117,10 @@
<string name="dialog_phone_call_prohibited_message" msgid="5730565540182492608">"Није могуће позвати овај број"</string>
<string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Да бисте подесили говорну пошту, идите у Мени > Подешавања."</string>
<string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"Да бисте позвали говорну пошту, прво искључите режим авионa."</string>
- <string name="contact_list_loading" msgid="5488620820563977329">"Учитавање…"</string>
+ <string name="contact_list_loading" msgid="5488620820563977329">"Учитава се…"</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
<string name="meid" msgid="6210568493746275750">"MEID"</string>
- <string name="simContacts_emptyLoading" msgid="6700035985448642408">"Учитавање са SIM картице је у току…"</string>
+ <string name="simContacts_emptyLoading" msgid="6700035985448642408">"Учитава се са SIM картице…"</string>
<string name="simContacts_title" msgid="27341688347689769">"Контакти на SIM картици"</string>
<string name="add_contact_not_available" msgid="5547311613368004859">"Нема доступне апликације за контакте"</string>
<string name="voice_search_not_available" msgid="2977719040254285301">"Гласовна претрага није доступна"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 99e887b..057de06 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -31,7 +31,7 @@
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Ibahagi ang voicemail"</string>
<string name="recentCalls_empty" msgid="8555115547405030734">"Walang mga tawag"</string>
<string name="clearCallLogConfirmation_title" msgid="801753155679372984">"I-clear ang history ng tawag?"</string>
- <string name="clearCallLogConfirmation" msgid="7899552396101432827">"Ide-delete nito ang lahat ng tawag mula sa iyong history"</string>
+ <string name="clearCallLogConfirmation" msgid="7899552396101432827">"Idi-delete nito ang lahat ng tawag mula sa iyong history"</string>
<string name="clearCallLogProgress_title" msgid="3372471156216306132">"Kini-clear ang history ng tawag…"</string>
<plurals name="notification_voicemail_title" formatted="false" msgid="9088953961148324851">
<item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemail </item>
@@ -183,7 +183,7 @@
<string name="voicemail_play_slower" msgid="4544796503902818832">"Mag-play nang mas mabagal."</string>
<string name="voicemail_play_start_pause" msgid="3687447935787768983">"Simulan o i-pause ang pag-playback."</string>
<string name="list_delimeter" msgid="4571593167738725100">", "</string>
- <string name="display_options_title" msgid="7812852361055667468">"Mga opsyon sa pagpapakita"</string>
+ <string name="display_options_title" msgid="7812852361055667468">"Mga display option"</string>
<string name="sounds_and_vibration_title" msgid="1692290115642160845">"Tunog at pag-vibrate"</string>
<string name="accessibility_settings_title" msgid="6068141142874046249">"Pagiging Naa-access"</string>
<string name="ringtone_title" msgid="760362035635084653">"Ringtone ng telepono"</string>
@@ -196,5 +196,5 @@
</string-array>
<string name="respond_via_sms_setting_title" msgid="1318281521087951580">"Mga mabilisang tugon"</string>
<string name="call_settings_label" msgid="313434211353070209">"Mga Tawag"</string>
- <string name="phone_account_settings_label" msgid="5864322009841175294">"Mga account sa pagtawag"</string>
+ <string name="phone_account_settings_label" msgid="5864322009841175294">"Account sa pagtawag"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 25cf92b..d12d931 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -31,7 +31,7 @@
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Sesli mesajı paylaş"</string>
<string name="recentCalls_empty" msgid="8555115547405030734">"Çağrı yok"</string>
<string name="clearCallLogConfirmation_title" msgid="801753155679372984">"Çağrı geçmişi temizlensin mi?"</string>
- <string name="clearCallLogConfirmation" msgid="7899552396101432827">"Bu işlem, geçmişinizdeki bütün çağrıları silecek"</string>
+ <string name="clearCallLogConfirmation" msgid="7899552396101432827">"Bu işlem, geçmişinizdeki tüm çağrıları silecek"</string>
<string name="clearCallLogProgress_title" msgid="3372471156216306132">"Çağrı geçmişi temizleniyor…"</string>
<plurals name="notification_voicemail_title" formatted="false" msgid="9088953961148324851">
<item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Sesli Mesaj </item>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 52a33f2..e714c78 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -29,6 +29,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Trace;
+import android.provider.CallLog.Calls;
import android.speech.RecognizerIntent;
import android.support.v4.view.ViewPager;
import android.telecom.PhoneAccount;
@@ -553,6 +554,8 @@
if (index < mListsFragment.getTabCount()) {
mListsFragment.showTab(index);
}
+ } else if (Calls.CONTENT_TYPE.equals(getIntent().getType())) {
+ mListsFragment.showTab(ListsFragment.TAB_INDEX_RECENTS);
}
Trace.endSection();
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 5108472..458c90b 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -108,8 +108,6 @@
// Tracks the rowId of the currently expanded list item, so the position can be updated if there
// are any changes to the call log entries, such as additions or removals.
private long mCurrentlyExpandedRowId = NO_EXPANDED_LIST_ITEM;
- // Whether the first call log list item has been automatically expanded for a new cursor.
- private boolean mHasBoundFirstView;
/**
* Hashmap, keyed by call Id, used to track the day group for a call. As call log entries are
@@ -359,19 +357,6 @@
mCallFetcher.fetchCalls();
}
- @Override
- public void changeCursor(Cursor cursor) {
- // Don't auto-expand the first item for the voicemail list fragment since that will
- // trigger an unwanted voicemail download and playback.
- if (mVoicemailPlaybackPresenter == null) {
- mHasBoundFirstView = false;
- mCurrentlyExpandedPosition = RecyclerView.NO_POSITION;
- mCurrentlyExpandedRowId = NO_EXPANDED_LIST_ITEM;
- }
-
- super.changeCursor(cursor);
- }
-
public void setLoading(boolean loading) {
mLoading = loading;
}
@@ -581,14 +566,8 @@
// In case ViewHolders were added/removed, update the expanded position if the rowIds
// match so that we can restore the correct expanded state on rebind.
mCurrentlyExpandedPosition = position;
- } else if (!mHasBoundFirstView && mVoicemailPlaybackPresenter == null) {
- // Expand the first view when loading the call log to expose the actions.
- // Don't auto-expand the first item for the voicemail list fragment since that will
- // trigger an unwanted voicemail download and playback.
- mCurrentlyExpandedRowId = views.rowId;
- mCurrentlyExpandedPosition = position;
- mHasBoundFirstView = true;
}
+
views.showActions(mCurrentlyExpandedPosition == position);
String nameForDefaultImage = null;
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 21ea97e..5d7c408 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -292,20 +292,6 @@
mAdapter.onRestoreInstanceState(savedInstanceState);
}
- /**
- * Based on the new intent, decide whether the list should be configured
- * to scroll up to display the first item.
- */
- public void configureScreenFromIntent(Intent newIntent) {
- // Typically, when switching to the call-log we want to show the user
- // the same section of the list that they were most recently looking
- // at. However, under some circumstances, we want to automatically
- // scroll to the top of the list to present the newest call items.
- // For example, immediately after a call is finished, we want to
- // display information about that call.
- mScrollToTop = Calls.CONTENT_TYPE.equals(newIntent.getType());
- }
-
@Override
public void onStart() {
// Start the empty loader now to defer other fragments. We destroy it when both calllog