Merge "Add phone account id and component name to NUI VM Pre-call." (3c7c6699) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayerView.java

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
	import com.android.dialer.common.concurrent.DialerExecutor.Worker;		import com.android.dialer.common.concurrent.DialerExecutor.Worker;
	import com.android.dialer.common.concurrent.DialerExecutorComponent;		import com.android.dialer.common.concurrent.DialerExecutorComponent;
	import com.android.dialer.precall.PreCall;		import com.android.dialer.precall.PreCall;
			import com.android.dialer.telecom.TelecomUtil;
	import com.android.dialer.voicemail.listui.NewVoicemailViewHolder.NewVoicemailViewHolderListener;		import com.android.dialer.voicemail.listui.NewVoicemailViewHolder.NewVoicemailViewHolderListener;
	import com.android.dialer.voicemail.model.VoicemailEntry;		import com.android.dialer.voicemail.model.VoicemailEntry;
	import java.util.Locale;		import java.util.Locale;
	@@ -68,6 +69,8 @@ public final class NewVoicemailMediaPlayerView extends LinearLayout {
	private TextView voicemailLoadingStatusView;		private TextView voicemailLoadingStatusView;
	private Uri voicemailUri;		private Uri voicemailUri;
	private String numberVoicemailFrom;		private String numberVoicemailFrom;
			private String phoneAccountId;
			private String phoneAccountComponentName;
	private FragmentManager fragmentManager;		private FragmentManager fragmentManager;
	private NewVoicemailViewHolder newVoicemailViewHolder;		private NewVoicemailViewHolder newVoicemailViewHolder;
	private NewVoicemailMediaPlayer mediaPlayer;		private NewVoicemailMediaPlayer mediaPlayer;
	@@ -122,6 +125,8 @@ public final class NewVoicemailMediaPlayerView extends LinearLayout {
	voicemailUri = null;		voicemailUri = null;
	voicemailLoadingStatusView.setVisibility(GONE);		voicemailLoadingStatusView.setVisibility(GONE);
	numberVoicemailFrom = null;		numberVoicemailFrom = null;
			phoneAccountId = null;
			phoneAccountComponentName = null;
	}		}

	/**		/**
	@@ -152,6 +157,8 @@ public final class NewVoicemailMediaPlayerView extends LinearLayout {
	Uri uri = Uri.parse(voicemailEntryFromAdapter.voicemailUri());		Uri uri = Uri.parse(voicemailEntryFromAdapter.voicemailUri());

	numberVoicemailFrom = voicemailEntryFromAdapter.number().getNormalizedNumber();		numberVoicemailFrom = voicemailEntryFromAdapter.number().getNormalizedNumber();
			phoneAccountId = voicemailEntryFromAdapter.phoneAccountId();
			phoneAccountComponentName = voicemailEntryFromAdapter.phoneAccountComponentName();

	Assert.isNotNull(viewHolder);		Assert.isNotNull(viewHolder);
	Assert.isNotNull(uri);		Assert.isNotNull(uri);
	@@ -510,7 +517,6 @@ public final class NewVoicemailMediaPlayerView extends LinearLayout {
	}		}
	};		};

	// TODO(uabdullah): Add phone account handle (a bug)
	private final View.OnClickListener phoneButtonListener =		private final View.OnClickListener phoneButtonListener =
	new View.OnClickListener() {		new View.OnClickListener() {
	@Override		@Override
	@@ -525,7 +531,11 @@ public final class NewVoicemailMediaPlayerView extends LinearLayout {
	!TextUtils.isEmpty(numberVoicemailFrom),		!TextUtils.isEmpty(numberVoicemailFrom),
	"number cannot be empty:" + numberVoicemailFrom);		"number cannot be empty:" + numberVoicemailFrom);
	PreCall.start(		PreCall.start(
	getContext(), new CallIntentBuilder(numberVoicemailFrom, Type.VOICEMAIL_LOG));		getContext(),
			new CallIntentBuilder(numberVoicemailFrom, Type.VOICEMAIL_LOG)
			.setPhoneAccountHandle(
			TelecomUtil.composePhoneAccountHandle(
			phoneAccountComponentName, phoneAccountId)));
	}		}
	};		};

java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,9 @@ final class VoicemailCursorLoader extends CursorLoader {
	AnnotatedCallLog.VOICEMAIL_URI,		AnnotatedCallLog.VOICEMAIL_URI,
	AnnotatedCallLog.IS_READ,		AnnotatedCallLog.IS_READ,
	AnnotatedCallLog.NUMBER_ATTRIBUTES,		AnnotatedCallLog.NUMBER_ATTRIBUTES,
	AnnotatedCallLog.TRANSCRIPTION_STATE		AnnotatedCallLog.TRANSCRIPTION_STATE,
			AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME,
			AnnotatedCallLog.PHONE_ACCOUNT_ID,
	};		};

	// Indexes for VOICEMAIL_COLUMNS		// Indexes for VOICEMAIL_COLUMNS
	@@ -61,6 +63,8 @@ final class VoicemailCursorLoader extends CursorLoader {
	private static final int IS_READ = 9;		private static final int IS_READ = 9;
	private static final int NUMBER_ATTRIBUTES = 10;		private static final int NUMBER_ATTRIBUTES = 10;
	private static final int TRANSCRIPTION_STATE = 11;		private static final int TRANSCRIPTION_STATE = 11;
			private static final int PHONE_ACCOUNT_COMPONENT_NAME = 12;
			private static final int PHONE_ACCOUNT_ID = 13;

	// TODO(zachh): Optimize indexes		// TODO(zachh): Optimize indexes
	VoicemailCursorLoader(Context context) {		VoicemailCursorLoader(Context context) {
	@@ -108,6 +112,8 @@ final class VoicemailCursorLoader extends CursorLoader {
	.setIsRead(cursor.getInt(IS_READ))		.setIsRead(cursor.getInt(IS_READ))
	.setNumberAttributes(numberAttributes)		.setNumberAttributes(numberAttributes)
	.setTranscriptionState(cursor.getInt(TRANSCRIPTION_STATE))		.setTranscriptionState(cursor.getInt(TRANSCRIPTION_STATE))
			.setPhoneAccountComponentName(cursor.getString(PHONE_ACCOUNT_COMPONENT_NAME))
			.setPhoneAccountId(cursor.getString(PHONE_ACCOUNT_ID))
	.build();		.build();
	}		}

java/com/android/dialer/voicemail/model/VoicemailEntry.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,12 @@ public abstract class VoicemailEntry {

	public abstract int transcriptionState();		public abstract int transcriptionState();

			@Nullable
			public abstract String phoneAccountComponentName();

			@Nullable
			public abstract String phoneAccountId();

	/** Builder for {@link VoicemailEntry}. */		/** Builder for {@link VoicemailEntry}. */
	@AutoValue.Builder		@AutoValue.Builder
	public abstract static class Builder {		public abstract static class Builder {
	@@ -96,6 +102,11 @@ public abstract class VoicemailEntry {

	public abstract Builder setTranscriptionState(int transcriptionState);		public abstract Builder setTranscriptionState(int transcriptionState);

			public abstract Builder setPhoneAccountComponentName(
			@Nullable String phoneAccountComponentName);

			public abstract Builder setPhoneAccountId(@Nullable String phoneAccountId);

	public abstract VoicemailEntry build();		public abstract VoicemailEntry build();
	}		}
	}		}