diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-11 21:48:22 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-11 21:48:22 +0000 |
commit | 3d198bb28ae6b086f967619b25407f65a7f3ebe9 (patch) | |
tree | a0fb688610549589fdff60123817caa59ba426a9 /java/com/android/dialer/app/calllog | |
parent | 7d34a79a4c1e128b29153102e260d9f791bd8041 (diff) | |
parent | 7f3f33c6f7ee64dda756c3a51a610c9565a7ee63 (diff) |
Merge changes I80ff3852,Ibe1c57bc,I93f35850
* changes:
Use layout_gravity to horizontally center each dialpad key in landscape mode.
Unify voicemail call placing
Stop storing device orientation in DialpadView's instance variable to improve reliability.
Diffstat (limited to 'java/com/android/dialer/app/calllog')
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java | 2 | ||||
-rw-r--r-- | java/com/android/dialer/app/calllog/IntentProvider.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java index fa73bb251..1c106a720 100644 --- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java +++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java @@ -547,7 +547,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder case CallbackAction.VOICE: if (mCallLogCache.isVoicemailNumber(accountHandle, number)) { // Call to generic voicemail number, in case there are multiple accounts - primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider()); + primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider(null)); } else if (canSupportAssistedDialing()) { primaryActionButtonView.setTag( IntentProvider.getAssistedDialIntentProvider( diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java index c812bf83b..36e62c379 100644 --- a/java/com/android/dialer/app/calllog/IntentProvider.java +++ b/java/com/android/dialer/app/calllog/IntentProvider.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.provider.ContactsContract; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; import com.android.contacts.common.model.Contact; @@ -32,7 +33,6 @@ import com.android.dialer.callintent.CallInitiationType; import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.duo.DuoComponent; -import com.android.dialer.util.CallUtil; import com.android.dialer.util.IntentUtil; import java.util.ArrayList; @@ -100,11 +100,12 @@ public abstract class IntentProvider { }; } - public static IntentProvider getReturnVoicemailCallIntentProvider() { + public static IntentProvider getReturnVoicemailCallIntentProvider( + @Nullable PhoneAccountHandle phoneAccountHandle) { return new IntentProvider() { @Override public Intent getIntent(Context context) { - return new CallIntentBuilder(CallUtil.getVoicemailUri(), CallInitiationType.Type.CALL_LOG) + return CallIntentBuilder.forVoicemail(phoneAccountHandle, CallInitiationType.Type.CALL_LOG) .build(); } }; |