diff options
author | Eric Erfanian <erfanian@google.com> | 2017-06-05 13:35:02 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-06-07 20:44:54 +0000 |
commit | 91ce7d2a476bd04fe525049a37a2f8b2824e9724 (patch) | |
tree | b9bbc285430ffb5363a70eb27e382c38f5a85b7a /java/com/android/dialer/app/voicemail | |
parent | 75233ff03785f24789b32039ac2c208805b7e506 (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/158012278.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/152373142 (4/06/2017) to cl/158012278 (6/05/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I4d3f14b5140e2e51bead9497bc118a205b3ebe76
Diffstat (limited to 'java/com/android/dialer/app/voicemail')
3 files changed, 15 insertions, 4 deletions
diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java index 9d07ec561..ffbae71f2 100644 --- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java +++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java @@ -43,6 +43,15 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { private static final String LEGACY_VOICEMAIL_COUNT = "legacy_voicemail_count"; + /** + * Hidden extra for {@link TelephonyManager#ACTION_SHOW_VOICEMAIL_NOTIFICATION} for whether the + * notification is just a refresh or for a new voicemail. The phone should not play a ringtone or + * vibrate during a refresh if the notification is already showing. + * + * <p>TODO(b/62202833): make public + */ + private static final String EXTRA_IS_REFRESH = "is_refresh"; + @Override public void onReceive(Context context, Intent intent) { LogUtil.i( @@ -51,7 +60,6 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { PhoneAccountHandle phoneAccountHandle = Assert.isNotNull(intent.getParcelableExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE)); - int count = intent.getIntExtra(TelephonyManager.EXTRA_NOTIFICATION_COUNT, -1); if (!hasVoicemailCountChanged(context, phoneAccountHandle, count)) { @@ -97,7 +105,8 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { count, voicemailNumber, callVoicemailIntent, - voicemailSettingIntent); + voicemailSettingIntent, + intent.getBooleanExtra(EXTRA_IS_REFRESH, false)); } private static boolean hasVoicemailCountChanged( diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index ea48c8321..686e3e8c4 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -548,7 +548,9 @@ public class VoicemailPlaybackPresenter mView.setClipPosition(mPosition, mDuration.get()); mView.enableUiElements(); mView.setSuccess(); - mMediaPlayer.seekTo(mPosition); + if (!mp.isPlaying()) { + mMediaPlayer.seekTo(mPosition); + } if (mIsPlaying) { resumePlayback(); diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml index bc9c46331..fb1b18621 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml @@ -55,7 +55,7 @@ <string name="voicemail_action_set_pin" msgid="958510049866316228">"पिन सेट करें"</string> <string name="voicemail_action_retry" msgid="4450307484541052511">"पुन: प्रयास करें"</string> <string name="voicemail_action_turn_archive_on" msgid="6008444955560830591">"चालू करें"</string> - <string name="voicemail_action_dimiss" msgid="6018415798136796966">"नहीं धन्यवाद"</string> + <string name="voicemail_action_dimiss" msgid="6018415798136796966">"रहने दें"</string> <string name="voicemail_action_sync" msgid="5139315923415392787">"समन्वयित करें"</string> <string name="voicemail_action_call_voicemail" msgid="6701710720535556395">"वॉइसमेल को कॉल करें"</string> <string name="voicemail_action_call_customer_support" msgid="7698973007656462748">"ग्राहक सहायता को कॉल करें"</string> |