From e00bbaeceb399da24f06c8f1a626cbbf07eab4ad Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 17 Apr 2018 14:48:03 -0700 Subject: Add RTT transcript screen. Bug: 67596257 Test: CallDetailsCursorLoaderTest PiperOrigin-RevId: 193259769 Change-Id: I8c6a8eb9a6bf06e9c1c25c45fc035f8db8ae5a65 --- .../android/dialer/app/calllog/CallLogAdapter.java | 5 +- .../dialer/calldetails/CallDetailsActivity.java | 3 + .../calldetails/CallDetailsActivityCommon.java | 31 +++++- .../dialer/calldetails/CallDetailsAdapter.java | 14 +++ .../calldetails/CallDetailsAdapterCommon.java | 15 ++- .../calldetails/CallDetailsCursorLoader.java | 5 +- .../calldetails/CallDetailsEntryViewHolder.java | 19 +++- .../dialer/calldetails/OldCallDetailsActivity.java | 3 + .../dialer/calldetails/OldCallDetailsAdapter.java | 33 ++++++ .../calldetails/proto/call_details_entries.proto | 8 ++ .../glidephotomanager/GlidePhotoManager.java | 10 ++ .../impl/GlidePhotoManagerImpl.java | 12 +- java/com/android/dialer/rtt/AndroidManifest.xml | 21 ++++ .../android/dialer/rtt/RttTranscriptActivity.java | 122 +++++++++++++++++++++ .../android/dialer/rtt/RttTranscriptAdapter.java | 88 +++++++++++++++ .../dialer/rtt/RttTranscriptMessageViewHolder.java | 95 ++++++++++++++++ java/com/android/dialer/rtt/RttTranscriptUtil.java | 8 +- .../dialer/rtt/res/color/bubble_background.xml | 21 ++++ .../dialer/rtt/res/drawable/message_bubble.xml | 21 ++++ .../rtt/res/layout/activity_rtt_transcript.xml | 30 +++++ .../rtt/res/layout/rtt_transcript_list_item.xml | 54 +++++++++ java/com/android/dialer/rtt/res/values/colors.xml | 20 ++++ java/com/android/dialer/rtt/res/values/dimens.xml | 21 ++++ java/com/android/dialer/rtt/res/values/styles.xml | 36 ++++++ java/com/android/incallui/RttCallPresenter.java | 2 + 25 files changed, 689 insertions(+), 8 deletions(-) create mode 100644 java/com/android/dialer/rtt/AndroidManifest.xml create mode 100644 java/com/android/dialer/rtt/RttTranscriptActivity.java create mode 100644 java/com/android/dialer/rtt/RttTranscriptAdapter.java create mode 100644 java/com/android/dialer/rtt/RttTranscriptMessageViewHolder.java create mode 100644 java/com/android/dialer/rtt/res/color/bubble_background.xml create mode 100644 java/com/android/dialer/rtt/res/drawable/message_bubble.xml create mode 100644 java/com/android/dialer/rtt/res/layout/activity_rtt_transcript.xml create mode 100644 java/com/android/dialer/rtt/res/layout/rtt_transcript_list_item.xml create mode 100644 java/com/android/dialer/rtt/res/values/colors.xml create mode 100644 java/com/android/dialer/rtt/res/values/dimens.xml create mode 100644 java/com/android/dialer/rtt/res/values/styles.xml (limited to 'java/com') diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index d25a2f38d..2f0c9b274 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -1008,7 +1008,10 @@ public class CallLogAdapter extends GroupingListAdapter .setDataUsage(cursor.getLong(CallLogQuery.DATA_USAGE)) .setDate(cursor.getLong(CallLogQuery.DATE)) .setDuration(cursor.getLong(CallLogQuery.DURATION)) - .setFeatures(cursor.getInt(CallLogQuery.FEATURES)); + .setFeatures(cursor.getInt(CallLogQuery.FEATURES)) + + .setCallMappingId(String.valueOf(cursor.getLong(CallLogQuery.DATE))); + String phoneAccountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME); if (DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index 4fab7fd85..f1d0d8487 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -23,6 +23,7 @@ import android.content.Loader; import android.database.Cursor; import android.os.Bundle; import com.android.dialer.CoalescedIds; +import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.ReportCallIdListener; import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener; @@ -89,6 +90,7 @@ public final class CallDetailsActivity extends CallDetailsActivityCommon { @Override protected CallDetailsAdapterCommon createAdapter( + CallDetailsEntryListener callDetailsEntryListener, CallDetailsHeaderListener callDetailsHeaderListener, ReportCallIdListener reportCallIdListener, DeleteCallDetailsListener deleteCallDetailsListener) { @@ -96,6 +98,7 @@ public final class CallDetailsActivity extends CallDetailsActivityCommon { this, headerInfo, getCallDetailsEntries(), + callDetailsEntryListener, callDetailsHeaderListener, reportCallIdListener, deleteCallDetailsListener); diff --git a/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java index 15a010eba..dec1230bd 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java @@ -55,12 +55,14 @@ import com.android.dialer.duo.DuoComponent; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; +import com.android.dialer.glidephotomanager.PhotoInfo; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.logging.UiAction; import com.android.dialer.performancereport.PerformanceReport; import com.android.dialer.postcall.PostCall; import com.android.dialer.precall.PreCall; +import com.android.dialer.rtt.RttTranscriptActivity; import com.android.dialer.rtt.RttTranscriptUtil; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; @@ -84,6 +86,8 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { public static final String EXTRA_CAN_REPORT_CALLER_ID = "can_report_caller_id"; public static final String EXTRA_CAN_SUPPORT_ASSISTED_DIALING = "can_support_assisted_dialing"; + private final CallDetailsEntryViewHolder.CallDetailsEntryListener callDetailsEntryListener = + new CallDetailsEntryListener(this); private final CallDetailsHeaderViewHolder.CallDetailsHeaderListener callDetailsHeaderListener = new CallDetailsHeaderListener(this); private final CallDetailsFooterViewHolder.DeleteCallDetailsListener deleteCallDetailsListener = @@ -106,6 +110,7 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { /** Creates an adapter for {@link OldCallDetailsActivity} or {@link CallDetailsActivity}. */ protected abstract CallDetailsAdapterCommon createAdapter( + CallDetailsEntryViewHolder.CallDetailsEntryListener callDetailsEntryListener, CallDetailsHeaderViewHolder.CallDetailsHeaderListener callDetailsHeaderListener, CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener, CallDetailsFooterViewHolder.DeleteCallDetailsListener deleteCallDetailsListener); @@ -212,7 +217,11 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { private void setupRecyclerViewForEntries() { adapter = - createAdapter(callDetailsHeaderListener, reportCallIdListener, deleteCallDetailsListener); + createAdapter( + callDetailsEntryListener, + callDetailsHeaderListener, + reportCallIdListener, + deleteCallDetailsListener); RecyclerView recyclerView = findViewById(R.id.recycler_view); recyclerView.setLayoutManager(new LinearLayoutManager(this)); @@ -288,6 +297,26 @@ abstract class CallDetailsActivityCommon extends AppCompatActivity { } } + private static final class CallDetailsEntryListener + implements CallDetailsEntryViewHolder.CallDetailsEntryListener { + private final WeakReference activityWeakReference; + + CallDetailsEntryListener(CallDetailsActivityCommon activity) { + this.activityWeakReference = new WeakReference<>(activity); + } + + @Override + public void showRttTranscript(String transcriptId, String primaryText, PhotoInfo photoInfo) { + getActivity() + .startActivity( + RttTranscriptActivity.getIntent(getActivity(), transcriptId, primaryText, photoInfo)); + } + + private CallDetailsActivityCommon getActivity() { + return Preconditions.checkNotNull(activityWeakReference.get()); + } + } + private static final class CallDetailsHeaderListener implements CallDetailsHeaderViewHolder.CallDetailsHeaderListener { private final WeakReference activityWeakReference; diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java index 2a4c1efca..40d856fa7 100644 --- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java +++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java @@ -20,8 +20,10 @@ package com.android.dialer.calldetails; import android.content.Context; import android.support.v7.widget.RecyclerView; import android.view.View; +import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener; import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener; +import com.android.dialer.glidephotomanager.PhotoInfo; /** * A {@link RecyclerView.Adapter} for {@link CallDetailsActivity}. @@ -38,12 +40,14 @@ final class CallDetailsAdapter extends CallDetailsAdapterCommon { Context context, CallDetailsHeaderInfo calldetailsHeaderInfo, CallDetailsEntries callDetailsEntries, + CallDetailsEntryListener callDetailsEntryListener, CallDetailsHeaderListener callDetailsHeaderListener, CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener, DeleteCallDetailsListener deleteCallDetailsListener) { super( context, callDetailsEntries, + callDetailsEntryListener, callDetailsHeaderListener, reportCallIdListener, deleteCallDetailsListener); @@ -72,4 +76,14 @@ final class CallDetailsAdapter extends CallDetailsAdapterCommon { protected String getNumber() { return headerInfo.getDialerPhoneNumber().getNormalizedNumber(); } + + @Override + protected String getPrimaryText() { + return headerInfo.getPrimaryText(); + } + + @Override + protected PhotoInfo getPhotoInfo() { + return headerInfo.getPhotoInfo(); + } } diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java b/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java index a79642bad..ec9263f1f 100644 --- a/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java +++ b/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java @@ -25,6 +25,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; +import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.ReportCallIdListener; import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener; @@ -33,6 +34,7 @@ import com.android.dialer.calllogutils.CallbackActionHelper; import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction; import com.android.dialer.common.Assert; import com.android.dialer.duo.DuoComponent; +import com.android.dialer.glidephotomanager.PhotoInfo; /** * Contains common logic shared between {@link OldCallDetailsAdapter} and {@link @@ -44,6 +46,7 @@ abstract class CallDetailsAdapterCommon extends RecyclerView.Adapter + callDetailsEntryListener.showRttTranscript( + entry.getCallMappingId(), primaryText, photoInfo)); } else { rttTranscript.setText(R.string.rtt_transcript_not_available); rttTranscript.setTextAppearance(R.style.RttTranscriptMessage); diff --git a/java/com/android/dialer/calldetails/OldCallDetailsActivity.java b/java/com/android/dialer/calldetails/OldCallDetailsActivity.java index c97436759..26217ab8a 100644 --- a/java/com/android/dialer/calldetails/OldCallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/OldCallDetailsActivity.java @@ -18,6 +18,7 @@ package com.android.dialer.calldetails; import android.content.Context; import android.content.Intent; +import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.ReportCallIdListener; import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener; @@ -76,6 +77,7 @@ public final class OldCallDetailsActivity extends CallDetailsActivityCommon { @Override protected CallDetailsAdapterCommon createAdapter( + CallDetailsEntryListener callDetailsEntryListener, CallDetailsHeaderListener callDetailsHeaderListener, ReportCallIdListener reportCallIdListener, DeleteCallDetailsListener deleteCallDetailsListener) { @@ -83,6 +85,7 @@ public final class OldCallDetailsActivity extends CallDetailsActivityCommon { /* context = */ this, contact, getCallDetailsEntries(), + callDetailsEntryListener, callDetailsHeaderListener, reportCallIdListener, deleteCallDetailsListener); diff --git a/java/com/android/dialer/calldetails/OldCallDetailsAdapter.java b/java/com/android/dialer/calldetails/OldCallDetailsAdapter.java index 010f5cd6c..878803cc3 100644 --- a/java/com/android/dialer/calldetails/OldCallDetailsAdapter.java +++ b/java/com/android/dialer/calldetails/OldCallDetailsAdapter.java @@ -20,9 +20,12 @@ package com.android.dialer.calldetails; import android.content.Context; import android.support.v7.widget.RecyclerView; import android.view.View; +import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener; import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener; import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener; import com.android.dialer.dialercontact.DialerContact; +import com.android.dialer.glidephotomanager.PhotoInfo; +import com.android.dialer.lettertile.LetterTileDrawable; /** * A {@link RecyclerView.Adapter} for {@link OldCallDetailsActivity}. @@ -39,12 +42,14 @@ final class OldCallDetailsAdapter extends CallDetailsAdapterCommon { Context context, DialerContact contact, CallDetailsEntries callDetailsEntries, + CallDetailsEntryListener callDetailsEntryListener, CallDetailsHeaderListener callDetailsHeaderListener, CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener, DeleteCallDetailsListener deleteCallDetailsListener) { super( context, callDetailsEntries, + callDetailsEntryListener, callDetailsHeaderListener, reportCallIdListener, deleteCallDetailsListener); @@ -70,4 +75,32 @@ final class OldCallDetailsAdapter extends CallDetailsAdapterCommon { protected String getNumber() { return contact.getNumber(); } + + @Override + protected String getPrimaryText() { + return contact.getNameOrNumber(); + } + + @Override + protected PhotoInfo getPhotoInfo() { + PhotoInfo.Builder builder = + PhotoInfo.newBuilder() + .setPhotoUri(contact.getPhotoUri()) + .setPhotoId(contact.getPhotoId()) + .setName(contact.getNameOrNumber()) + .setLookupUri(contact.getContactUri()); + switch (contact.getContactType()) { + case LetterTileDrawable.TYPE_VOICEMAIL: + builder.setIsVoicemail(true); + break; + case LetterTileDrawable.TYPE_BUSINESS: + builder.setIsBusiness(true); + break; + case LetterTileDrawable.TYPE_SPAM: + builder.setIsSpam(true); + break; + default: // fall out + } + return builder.build(); + } } diff --git a/java/com/android/dialer/calldetails/proto/call_details_entries.proto b/java/com/android/dialer/calldetails/proto/call_details_entries.proto index e0202cda1..0f11b537e 100644 --- a/java/com/android/dialer/calldetails/proto/call_details_entries.proto +++ b/java/com/android/dialer/calldetails/proto/call_details_entries.proto @@ -20,6 +20,14 @@ message CallDetailsEntries { repeated enrichedcall.historyquery.proto.HistoryResult history_results = 7; optional bool is_duo_call = 8; optional bool has_rtt_transcript = 9; + // A unique ID that could be used to map a call log entry to a {@link + // android.telecom.Call}. This is different from call_id which is id of call + // log entry. + // On pre-Q this will be {@link android.provider.CallLog.Calls#DATE} which + // is same as {@link com.android.telecom.Call#getCreationTimeMillis()}. + // Starting from Q this will be a call UUID generated by system to associate + // a call log to a telecom call. + optional string call_mapping_id = 10; } repeated CallDetailsEntry entries = 1; diff --git a/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java b/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java index 519a39481..de16c387d 100644 --- a/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java +++ b/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java @@ -17,6 +17,7 @@ package com.android.dialer.glidephotomanager; import android.support.annotation.MainThread; +import android.widget.ImageView; import android.widget.QuickContactBadge; /** Class to load photo for call/contacts */ @@ -30,4 +31,13 @@ public interface GlidePhotoManager { */ @MainThread void loadQuickContactBadge(QuickContactBadge badge, PhotoInfo photoInfo); + + /** + * Load {@code photoInfo} into the {@code imageView}. The loading is performed in the background + * and a placeholder will be used appropriately. {@code imageView} must be already attached to an + * activity/fragment, and the load will be automatically canceled if the lifecycle of the activity + * ends. + */ + @MainThread + void loadContactPhoto(ImageView imageView, PhotoInfo photoInfo); } diff --git a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java index 202307a29..562177c48 100644 --- a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java +++ b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java @@ -25,6 +25,7 @@ import android.support.annotation.MainThread; import android.support.annotation.Nullable; import android.telecom.TelecomManager; import android.text.TextUtils; +import android.widget.ImageView; import android.widget.QuickContactBadge; import com.android.dialer.common.Assert; import com.android.dialer.glide.GlideApp; @@ -54,8 +55,15 @@ public class GlidePhotoManagerImpl implements GlidePhotoManager { ? DefaultLookupUriGenerator.generateUri(photoInfo) : parseUri(photoInfo.getLookupUri())); badge.setOverlay(null); - GlideRequest request = buildRequest(GlideApp.with(badge), photoInfo); - request.into(badge); + loadContactPhoto(badge, photoInfo); + } + + @MainThread + @Override + public void loadContactPhoto(ImageView imageView, PhotoInfo photoInfo) { + Assert.isMainThread(); + GlideRequest request = buildRequest(GlideApp.with(imageView), photoInfo); + request.into(imageView); } private GlideRequest buildRequest(GlideRequests requestManager, PhotoInfo photoInfo) { diff --git a/java/com/android/dialer/rtt/AndroidManifest.xml b/java/com/android/dialer/rtt/AndroidManifest.xml new file mode 100644 index 000000000..c92fb1ceb --- /dev/null +++ b/java/com/android/dialer/rtt/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/rtt/RttTranscriptActivity.java b/java/com/android/dialer/rtt/RttTranscriptActivity.java new file mode 100644 index 000000000..2087250b3 --- /dev/null +++ b/java/com/android/dialer/rtt/RttTranscriptActivity.java @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.rtt; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.MenuItem; +import com.android.dialer.common.Assert; +import com.android.dialer.common.concurrent.DialerExecutorComponent; +import com.android.dialer.common.concurrent.UiListener; +import com.android.dialer.glidephotomanager.PhotoInfo; +import com.android.dialer.protos.ProtoParsers; +import com.google.common.util.concurrent.ListenableFuture; + +/** Activity holds RTT transcript. */ +public class RttTranscriptActivity extends AppCompatActivity { + + public static final String EXTRA_TRANSCRIPT_ID = "extra_transcript_id"; + public static final String EXTRA_PRIMARY_TEXT = "extra_primary_text"; + public static final String EXTRA_PHOTO_INFO = "extra_photo_info"; + + private RttTranscriptAdapter adapter; + private UiListener rttTranscriptUiListener; + + public static Intent getIntent( + Context context, String transcriptId, String primaryText, PhotoInfo photoInfo) { + Intent intent = new Intent(context, RttTranscriptActivity.class); + intent.putExtra(RttTranscriptActivity.EXTRA_TRANSCRIPT_ID, transcriptId); + intent.putExtra(RttTranscriptActivity.EXTRA_PRIMARY_TEXT, primaryText); + ProtoParsers.put(intent, RttTranscriptActivity.EXTRA_PHOTO_INFO, Assert.isNotNull(photoInfo)); + return intent; + } + + @Override + protected void onCreate(@Nullable Bundle bundle) { + super.onCreate(bundle); + setContentView(R.layout.activity_rtt_transcript); + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayShowHomeEnabled(true); + actionBar.setDisplayHomeAsUpEnabled(true); + + RecyclerView recyclerView = findViewById(R.id.rtt_recycler_view); + LinearLayoutManager layoutManager = new LinearLayoutManager(this); + layoutManager.setStackFromEnd(true); + recyclerView.setLayoutManager(layoutManager); + recyclerView.setHasFixedSize(true); + adapter = new RttTranscriptAdapter(this); + recyclerView.setAdapter(adapter); + + rttTranscriptUiListener = + DialerExecutorComponent.get(this) + .createUiListener(getFragmentManager(), "Load RTT transcript"); + handleIntent(getIntent()); + } + + private void handleIntent(Intent intent) { + Assert.checkArgument(intent.hasExtra(EXTRA_TRANSCRIPT_ID)); + Assert.checkArgument(intent.hasExtra(EXTRA_PRIMARY_TEXT)); + Assert.checkArgument(intent.hasExtra(EXTRA_PHOTO_INFO)); + + String id = intent.getStringExtra(EXTRA_TRANSCRIPT_ID); + rttTranscriptUiListener.listen( + this, + getRttTranscript(id), + adapter::setRttTranscript, + throwable -> { + throw new RuntimeException(throwable); + }); + + String primaryText = intent.getStringExtra(EXTRA_PRIMARY_TEXT); + getSupportActionBar().setTitle(primaryText); + + PhotoInfo photoInfo = + ProtoParsers.getTrusted(intent, EXTRA_PHOTO_INFO, PhotoInfo.getDefaultInstance()); + // Photo shown here shouldn't have video or RTT badge. + PhotoInfo sanitizedPhotoInfo = + PhotoInfo.newBuilder().mergeFrom(photoInfo).setIsRtt(false).setIsVideo(false).build(); + adapter.setPhotoInfo(sanitizedPhotoInfo); + } + + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + handleIntent(intent); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + final int itemId = item.getItemId(); + if (itemId == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } + + private ListenableFuture getRttTranscript(String id) { + return DialerExecutorComponent.get(this) + .backgroundExecutor() + .submit(() -> new RttTranscriptUtil(this).getRttTranscript(id)); + } +} diff --git a/java/com/android/dialer/rtt/RttTranscriptAdapter.java b/java/com/android/dialer/rtt/RttTranscriptAdapter.java new file mode 100644 index 000000000..6e030349d --- /dev/null +++ b/java/com/android/dialer/rtt/RttTranscriptAdapter.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.rtt; + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import com.android.dialer.glidephotomanager.PhotoInfo; + +/** Adapter class for holding RTT chat data. */ +public class RttTranscriptAdapter extends RecyclerView.Adapter { + + private PhotoInfo photoInfo; + + private final Context context; + private RttTranscript rttTranscript; + + RttTranscriptAdapter(Context context) { + this.context = context; + } + + @Override + public RttTranscriptMessageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + LayoutInflater layoutInflater = LayoutInflater.from(context); + View view = layoutInflater.inflate(R.layout.rtt_transcript_list_item, parent, false); + return new RttTranscriptMessageViewHolder(view); + } + + @Override + public int getItemViewType(int position) { + return super.getItemViewType(position); + } + + @Override + public void onBindViewHolder(RttTranscriptMessageViewHolder rttChatMessageViewHolder, int i) { + boolean isSameGroup = false; + boolean hasMoreInSameGroup = false; + RttTranscriptMessage rttTranscriptMessage = rttTranscript.getMessages(i); + if (i > 0) { + isSameGroup = + rttTranscriptMessage.getIsRemote() == rttTranscript.getMessages(i - 1).getIsRemote(); + } + if (i + 1 < getItemCount()) { + hasMoreInSameGroup = + rttTranscriptMessage.getIsRemote() == rttTranscript.getMessages(i + 1).getIsRemote(); + } + rttChatMessageViewHolder.setMessage(rttTranscriptMessage, isSameGroup, photoInfo); + if (hasMoreInSameGroup) { + rttChatMessageViewHolder.hideTimestamp(); + } else { + rttChatMessageViewHolder.showTimestamp( + rttTranscriptMessage.getTimestamp(), rttTranscriptMessage.getIsRemote(), i == 0); + } + } + + @Override + public int getItemCount() { + if (rttTranscript == null) { + return 0; + } + return rttTranscript.getMessagesCount(); + } + + void setRttTranscript(RttTranscript rttTranscript) { + this.rttTranscript = rttTranscript; + notifyDataSetChanged(); + } + + void setPhotoInfo(PhotoInfo photoInfo) { + this.photoInfo = photoInfo; + } +} diff --git a/java/com/android/dialer/rtt/RttTranscriptMessageViewHolder.java b/java/com/android/dialer/rtt/RttTranscriptMessageViewHolder.java new file mode 100644 index 000000000..daa8136fe --- /dev/null +++ b/java/com/android/dialer/rtt/RttTranscriptMessageViewHolder.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.rtt; + +import android.content.Context; +import android.content.res.Resources; +import android.support.v7.widget.RecyclerView.ViewHolder; +import android.text.format.DateUtils; +import android.view.Gravity; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.LinearLayout.LayoutParams; +import android.widget.TextView; +import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent; +import com.android.dialer.glidephotomanager.PhotoInfo; + +/** ViewHolder class for RTT chat message bubble. */ +public class RttTranscriptMessageViewHolder extends ViewHolder { + + private final TextView messageTextView; + private final Resources resources; + private final ImageView avatarImageView; + private final View container; + private final TextView timestampTextView; + + RttTranscriptMessageViewHolder(View view) { + super(view); + container = view.findViewById(R.id.rtt_chat_message_container); + messageTextView = view.findViewById(R.id.rtt_chat_message); + avatarImageView = view.findViewById(R.id.rtt_chat_avatar); + timestampTextView = view.findViewById(R.id.rtt_chat_timestamp); + resources = view.getResources(); + } + + void setMessage(RttTranscriptMessage message, boolean isSameGroup, PhotoInfo photoInfo) { + messageTextView.setText(message.getContent()); + LinearLayout.LayoutParams params = (LayoutParams) container.getLayoutParams(); + params.gravity = message.getIsRemote() ? Gravity.START : Gravity.END; + params.topMargin = + isSameGroup + ? resources.getDimensionPixelSize(R.dimen.rtt_transcript_same_group_message_margin_top) + : resources.getDimensionPixelSize(R.dimen.rtt_transcript_message_margin_top); + container.setLayoutParams(params); + messageTextView.setEnabled(message.getIsRemote()); + if (message.getIsRemote()) { + if (isSameGroup) { + avatarImageView.setVisibility(View.INVISIBLE); + } else { + avatarImageView.setVisibility(View.VISIBLE); + GlidePhotoManagerComponent.get(container.getContext()) + .glidePhotoManager() + .loadContactPhoto(avatarImageView, photoInfo); + } + messageTextView.setTextAppearance(R.style.RttTranscriptBubble_Remote); + } else { + avatarImageView.setVisibility(View.GONE); + messageTextView.setTextAppearance(R.style.RttTranscriptBubble_Local); + } + } + + void showTimestamp(long timestamp, boolean isRemote, boolean showFullDate) { + timestampTextView.setVisibility(View.VISIBLE); + timestampTextView.setText( + getTimestampText(timestampTextView.getContext(), timestamp, showFullDate)); + timestampTextView.setGravity(isRemote ? Gravity.START : Gravity.END); + } + + void hideTimestamp() { + timestampTextView.setVisibility(View.GONE); + } + + private String getTimestampText(Context context, long timestamp, boolean showFullDate) { + return DateUtils.formatDateTime( + context, + timestamp, + showFullDate + ? DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME + : DateUtils.FORMAT_SHOW_TIME); + } +} diff --git a/java/com/android/dialer/rtt/RttTranscriptUtil.java b/java/com/android/dialer/rtt/RttTranscriptUtil.java index e55d2ea55..19b46b01a 100644 --- a/java/com/android/dialer/rtt/RttTranscriptUtil.java +++ b/java/com/android/dialer/rtt/RttTranscriptUtil.java @@ -30,7 +30,13 @@ public final class RttTranscriptUtil { private final RttTranscriptDatabaseHelper databaseHelper; public RttTranscriptUtil(Context context) { - databaseHelper = new RttTranscriptDatabaseHelper(context); + databaseHelper = new RttTranscriptDatabaseHelper(context.getApplicationContext()); + } + + @Override + protected void finalize() throws Throwable { + databaseHelper.close(); + super.finalize(); } /** @return true if there is RTT transcript available. */ diff --git a/java/com/android/dialer/rtt/res/color/bubble_background.xml b/java/com/android/dialer/rtt/res/color/bubble_background.xml new file mode 100644 index 000000000..fb29ab6c5 --- /dev/null +++ b/java/com/android/dialer/rtt/res/color/bubble_background.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/rtt/res/drawable/message_bubble.xml b/java/com/android/dialer/rtt/res/drawable/message_bubble.xml new file mode 100644 index 000000000..2b01f62f9 --- /dev/null +++ b/java/com/android/dialer/rtt/res/drawable/message_bubble.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/rtt/res/layout/activity_rtt_transcript.xml b/java/com/android/dialer/rtt/res/layout/activity_rtt_transcript.xml new file mode 100644 index 000000000..628a7932e --- /dev/null +++ b/java/com/android/dialer/rtt/res/layout/activity_rtt_transcript.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/java/com/android/dialer/rtt/res/layout/rtt_transcript_list_item.xml b/java/com/android/dialer/rtt/res/layout/rtt_transcript_list_item.xml new file mode 100644 index 000000000..d86a6823a --- /dev/null +++ b/java/com/android/dialer/rtt/res/layout/rtt_transcript_list_item.xml @@ -0,0 +1,54 @@ + + + + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/rtt/res/values/colors.xml b/java/com/android/dialer/rtt/res/values/colors.xml new file mode 100644 index 000000000..5de06f9f2 --- /dev/null +++ b/java/com/android/dialer/rtt/res/values/colors.xml @@ -0,0 +1,20 @@ + + + + #37474F + #ECEFF1 + \ No newline at end of file diff --git a/java/com/android/dialer/rtt/res/values/dimens.xml b/java/com/android/dialer/rtt/res/values/dimens.xml new file mode 100644 index 000000000..a36cdd746 --- /dev/null +++ b/java/com/android/dialer/rtt/res/values/dimens.xml @@ -0,0 +1,21 @@ + + + + 16dp + 2dp + 40dp + diff --git a/java/com/android/dialer/rtt/res/values/styles.xml b/java/com/android/dialer/rtt/res/values/styles.xml new file mode 100644 index 000000000..d8bc245ef --- /dev/null +++ b/java/com/android/dialer/rtt/res/values/styles.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/java/com/android/incallui/RttCallPresenter.java b/java/com/android/incallui/RttCallPresenter.java index 21e28cee4..211469147 100644 --- a/java/com/android/incallui/RttCallPresenter.java +++ b/java/com/android/incallui/RttCallPresenter.java @@ -90,7 +90,9 @@ public class RttCallPresenter implements RttCallScreenDelegate, InCallStateListe LogUtil.enterBlock("RttCallPresenter.saveTranscript"); RttTranscript.Builder builder = RttTranscript.newBuilder(); builder + .setId(String.valueOf(dialerCall.getCreationTimeMillis())) + .setTimestamp(dialerCall.getCreationTimeMillis()) .setNumber(dialerCall.getNumber()) .addAllMessages(rttCallScreen.getRttTranscriptMessageList()); -- cgit v1.2.3