Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94067bd7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I4727645c,I13015ee6 

* changes:
  Added CallLogConfig.
  Split CallDetailsActivity
parents ede6377e c44bc801

java/com/android/dialer/app/DialtactsActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ import com.android.dialer.app.settings.DialerSettingsActivity; 
import com.android.dialer.app.widget.ActionBarController;

import com.android.dialer.app.widget.SearchEditTextLayout;

import com.android.dialer.callcomposer.CallComposerActivity;

import com.android.dialer.calldetails.CallDetailsActivity;

import com.android.dialer.calldetails.OldCallDetailsActivity;

import com.android.dialer.callintent.CallInitiationType;

import com.android.dialer.callintent.CallIntentBuilder;

import com.android.dialer.callintent.CallSpecificAppData;
@@ -838,8 +838,8 @@ public class DialtactsActivity extends TransactionSafeActivity 
    } else if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_DETAILS) {

      if (resultCode == RESULT_OK

          && data != null

          && data.getBooleanExtra(CallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {

        String number = data.getStringExtra(CallDetailsActivity.EXTRA_PHONE_NUMBER);

          && data.getBooleanExtra(OldCallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {

        String number = data.getStringExtra(OldCallDetailsActivity.EXTRA_PHONE_NUMBER);

        int snackbarDurationMillis = 5_000;

        Snackbar.make(parentLayout, getString(R.string.ec_data_deleted), snackbarDurationMillis)

            .setAction(

java/com/android/dialer/app/calllog/CallLogActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.view.ViewGroup; 
import com.android.contacts.common.list.ViewPagerTabs;

import com.android.dialer.app.DialtactsActivity;

import com.android.dialer.app.R;

import com.android.dialer.calldetails.CallDetailsActivity;

import com.android.dialer.calldetails.OldCallDetailsActivity;

import com.android.dialer.common.Assert;

import com.android.dialer.constants.ActivityRequestCodes;

import com.android.dialer.database.CallLogQueryHandler;
@@ -282,8 +282,8 @@ public class CallLogActivity extends TransactionSafeActivity 
    if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_DETAILS) {

      if (resultCode == RESULT_OK

          && data != null

          && data.getBooleanExtra(CallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {

        String number = data.getStringExtra(CallDetailsActivity.EXTRA_PHONE_NUMBER);

          && data.getBooleanExtra(OldCallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {

        String number = data.getStringExtra(OldCallDetailsActivity.EXTRA_PHONE_NUMBER);

        Snackbar.make(findViewById(R.id.calllog_frame), getString(R.string.ec_data_deleted), 5_000)

            .setAction(

                R.string.view_conversation,

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ import com.android.dialer.blocking.BlockedNumbersMigrator; 
import com.android.dialer.blocking.FilteredNumberCompat;

import com.android.dialer.blocking.FilteredNumbersUtil;

import com.android.dialer.callcomposer.CallComposerActivity;

import com.android.dialer.calldetails.CallDetailsActivity;

import com.android.dialer.calldetails.CallDetailsEntries;

import com.android.dialer.calldetails.OldCallDetailsActivity;

import com.android.dialer.callintent.CallIntentBuilder;

import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;

import com.android.dialer.clipboard.ClipboardUtils;
@@ -1037,7 +1037,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
    String packageName = intent.getPackage();

    if (DuoConstants.PACKAGE_NAME.equals(packageName)) {

      startDuoActivity(intent);

    } else if (CallDetailsActivity.isLaunchIntent(intent)) {

    } else if (OldCallDetailsActivity.isLaunchIntent(intent)) {

      PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL);

      ((Activity) context)

          .startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_CALL_DETAILS);

java/com/android/dialer/app/calllog/IntentProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import android.telecom.PhoneAccountHandle; 
import android.telephony.TelephonyManager;

import com.android.contacts.common.model.Contact;

import com.android.contacts.common.model.ContactLoader;

import com.android.dialer.calldetails.CallDetailsActivity;

import com.android.dialer.calldetails.CallDetailsEntries;

import com.android.dialer.calldetails.OldCallDetailsActivity;

import com.android.dialer.callintent.CallInitiationType;

import com.android.dialer.callintent.CallIntentBuilder;

import com.android.dialer.dialercontact.DialerContact;
@@ -184,7 +184,7 @@ public abstract class IntentProvider { 
    return new IntentProvider() {

      @Override

      public Intent getIntent(Context context) {

        return CallDetailsActivity.newInstance(

        return OldCallDetailsActivity.newInstance(

            context, callDetailsEntries, contact, canReportCallerId, canSupportAssistedDialing);

      }

    };

java/com/android/dialer/calldetails/AndroidManifest.xml

+7 −1
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 
  xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.dialer.calldetails">

  <application android:theme="@style/Theme.AppCompat">

    <activity

      android:label="@string/call_details"

      android:exported="false"

      android:name="com.android.dialer.calldetails.OldCallDetailsActivity"

      android:theme="@style/DialerThemeBase.NoActionBar">

    </activity>

    <activity

        android:label="@string/call_details"

        android:exported="false"