From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 9 Jun 2017 14:16:05 +0000 Subject: Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47" This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b --- .../android/dialer/calldetails/CallDetailsActivity.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'java/com/android/dialer/calldetails/CallDetailsActivity.java') diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index 4d5853fef..7eab951fa 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -29,13 +29,12 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar.OnMenuItemClickListener; import android.view.MenuItem; +import com.android.dialer.callcomposer.CallComposerContact; import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.common.Assert; import com.android.dialer.common.concurrent.AsyncTaskExecutors; -import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; -import com.android.dialer.postcall.PostCall; import com.android.dialer.protos.ProtoParsers; import java.util.List; @@ -49,7 +48,7 @@ public class CallDetailsActivity extends AppCompatActivity implements OnMenuItem private List entries; public static Intent newInstance( - Context context, @NonNull CallDetailsEntries details, @NonNull DialerContact contact) { + Context context, @NonNull CallDetailsEntries details, @NonNull CallComposerContact contact) { Assert.isNotNull(details); Assert.isNotNull(contact); @@ -70,12 +69,6 @@ public class CallDetailsActivity extends AppCompatActivity implements OnMenuItem onHandleIntent(getIntent()); } - @Override - protected void onResume() { - super.onResume(); - PostCall.promptUserForMessageIfNecessary(this, findViewById(R.id.recycler_view)); - } - @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -83,8 +76,8 @@ public class CallDetailsActivity extends AppCompatActivity implements OnMenuItem } private void onHandleIntent(Intent intent) { - DialerContact contact = - ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance()); + CallComposerContact contact = + ProtoParsers.getTrusted(intent, EXTRA_CONTACT, CallComposerContact.getDefaultInstance()); entries = ProtoParsers.getTrusted( intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance()) -- cgit v1.2.3