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

Commit 842a9777 authored by Eric Erfanian's avatar Eric Erfanian
Browse files

Update AOSP Dialer source from internal google3 repository at 

cl/159771812.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/159428781 (6/19/2017) to cl/159771812 (6/22/2017).

These changes track the dialer V11 release.

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.

Merged-In: I39aba7e972bac6e5864e70ed693849d90ecd7e08

Change-Id: Ia87877f7ae67c5b56078477b8b08082de1355315
parent a8a71b12

Android.mk

+43 −19
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
# * removed com.google.android.geo.API_KEY key. This should be added to

#      the manifest files in java/com/android/incallui/calllocation/impl/

#      and /java/com/android/incallui/maps/impl/

# * b/62417801 removed translation string variant:

#      $ find java/com/android/incallui/res/*mcc262*/strings.xml | xargs rm

# * b/62417801 modify translation string naming convention:

#      $ find . -type d | grep 262 | rename 's/(values)\-([a-zA-Z\+\-]+)\-(mcc262-mnc01)/$1-$3-$2/'

# * b/62343966 include manually generated GRPC service class:

#      $ protoc --plugin=protoc-gen-grpc-java=prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-linux-x86_64.exe \

#               --grpc-java_out=lite:"packages/apps/Dialer/java/com/android/voicemail/impl/" \

#               --proto_path="packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/" "packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto"

# * b/62787062 / b/37077388 temporarily disable proguard with javac

# * b/37077388 temporarily disable proguard with javac

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)
@@ -33,7 +33,6 @@ SRC_DIRS := \ 


# Exclude files incompatible with AOSP.

EXCLUDE_FILES := \

	$(BASE_DIR)/dialer/calllog/testing/FakeCallLogApplication.java \

	$(BASE_DIR)/incallui/calllocation/impl/AuthException.java \

	$(BASE_DIR)/incallui/calllocation/impl/CallLocationImpl.java \

	$(BASE_DIR)/incallui/calllocation/impl/CallLocationModule.java \
@@ -54,6 +53,16 @@ EXCLUDE_FILES := \ 
EXCLUDE_FILES += \

	$(BASE_DIR)/contacts/common/format/testing/SpannedTestUtils.java



# Exclude build variants for now

EXCLUDE_FILES += \

	$(BASE_DIR)/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java \

	$(BASE_DIR)/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java \

	$(BASE_DIR)/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java \

	$(BASE_DIR)/dialer/buildtype/test/BuildTypeAccessorImpl.java \

	$(BASE_DIR)/dialer/constants/googledialer/ConstantsImpl.java \

	$(BASE_DIR)/dialer/binary/google/GoogleStubDialerRootComponent.java \

	$(BASE_DIR)/dialer/binary/google/GoogleStubDialerApplication.java



# All Dialers resources.

# find . -type d -name "res" | uniq | sort

RES_DIRS := \
@@ -74,22 +83,23 @@ RES_DIRS := \ 
	$(BASE_DIR)/dialer/contactactions/res \

	$(BASE_DIR)/dialer/contactsfragment/res \

	$(BASE_DIR)/dialer/dialpadview/res \

	$(BASE_DIR)/dialer/enrichedcall/simulator/res \

	$(BASE_DIR)/dialer/interactions/res \

	$(BASE_DIR)/dialer/main/impl/res \

	$(BASE_DIR)/dialer/notification/res \

	$(BASE_DIR)/dialer/oem/res \

	$(BASE_DIR)/dialer/phonenumberutil/res \

	$(BASE_DIR)/dialer/postcall/res \

	$(BASE_DIR)/dialer/searchfragment/common/res \

	$(BASE_DIR)/dialer/searchfragment/list/res \

	$(BASE_DIR)/dialer/searchfragment/nearbyplaces/res \

	$(BASE_DIR)/dialer/searchfragment/common/res \

	$(BASE_DIR)/dialershared/bubble/res \

	$(BASE_DIR)/dialer/shortcuts/res \

	$(BASE_DIR)/dialer/speeddial/res \

	$(BASE_DIR)/dialer/theme/res \

	$(BASE_DIR)/dialer/util/res \

	$(BASE_DIR)/dialer/voicemailstatus/res \

	$(BASE_DIR)/dialer/widget/res \

	$(BASE_DIR)/dialershared/bubble/res \

	$(BASE_DIR)/incallui/answer/impl/affordance/res \

	$(BASE_DIR)/incallui/answer/impl/answermethod/res \

	$(BASE_DIR)/incallui/answer/impl/hint/res \
@@ -132,15 +142,17 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/dialer/contactactions/AndroidManifest.xml \

	$(BASE_DIR)/dialer/contactsfragment/AndroidManifest.xml \

	$(BASE_DIR)/dialer/dialpadview/AndroidManifest.xml \

	$(BASE_DIR)/dialer/enrichedcall/simulator/AndroidManifest.xml \

	$(BASE_DIR)/dialer/interactions/AndroidManifest.xml \

	$(BASE_DIR)/dialer/main/impl/AndroidManifest.xml \

	$(BASE_DIR)/dialer/notification/AndroidManifest.xml \

	$(BASE_DIR)/dialer/oem/AndroidManifest.xml \

	$(BASE_DIR)/dialer/phonenumberutil/AndroidManifest.xml \

	$(BASE_DIR)/dialer/postcall/AndroidManifest.xml \

	$(BASE_DIR)/dialer/searchfragment/common/AndroidManifest.xml \

	$(BASE_DIR)/dialer/searchfragment/list/AndroidManifest.xml \

	$(BASE_DIR)/dialer/searchfragment/nearbyplaces/AndroidManifest.xml \

	$(BASE_DIR)/dialer/searchfragment/common/AndroidManifest.xml \

	$(BASE_DIR)/dialershared/bubble/AndroidManifest.xml \

	$(BASE_DIR)/dialer/shortcuts/AndroidManifest.xml \

	$(BASE_DIR)/dialer/simulator/impl/AndroidManifest.xml \

	$(BASE_DIR)/dialer/speeddial/AndroidManifest.xml \
@@ -148,7 +160,6 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/dialer/util/AndroidManifest.xml \

	$(BASE_DIR)/dialer/voicemailstatus/AndroidManifest.xml \

	$(BASE_DIR)/dialer/widget/AndroidManifest.xml \

	$(BASE_DIR)/dialershared/bubble/AndroidManifest.xml \

	$(BASE_DIR)/incallui/AndroidManifest.xml \

	$(BASE_DIR)/incallui/answer/impl/affordance/AndroidManifest.xml \

	$(BASE_DIR)/incallui/answer/impl/AndroidManifest.xml \
@@ -166,8 +177,8 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \

	$(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \

	$(BASE_DIR)/incallui/wifi/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/impl/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/impl/AndroidManifest.xml \





# Merge all manifest files.
@@ -206,22 +217,23 @@ LOCAL_AAPT_FLAGS := \ 
        --extra-packages com.android.dialer.contactactions \

	--extra-packages com.android.dialer.contactsfragment \

	--extra-packages com.android.dialer.dialpadview \

	--extra-packages com.android.dialer.enrichedcall.simulator \

	--extra-packages com.android.dialer.interactions \

	--extra-packages com.android.dialer.main.impl \

	--extra-packages com.android.dialer.notification \

	--extra-packages com.android.dialer.oem \

	--extra-packages com.android.dialer.phonenumberutil \

	--extra-packages com.android.dialer.postcall \

	--extra-packages com.android.dialer.searchfragment.common \

	--extra-packages com.android.dialer.searchfragment.list \

	--extra-packages com.android.dialer.searchfragment.nearbyplaces \

	--extra-packages com.android.dialer.searchfragment.common \

	--extra-packages com.android.dialershared.bubble \

	--extra-packages com.android.dialer.shortcuts \

	--extra-packages com.android.dialer.speeddial \

	--extra-packages com.android.dialer.theme \

	--extra-packages com.android.dialer.util \

	--extra-packages com.android.dialer.voicemailstatus \

	--extra-packages com.android.dialer.widget \

	--extra-packages com.android.dialershared.bubble \

	--extra-packages com.android.incallui \

	--extra-packages com.android.incallui.answer.impl \

	--extra-packages com.android.incallui.answer.impl.affordance \
@@ -249,7 +261,8 @@ LOCAL_AAPT_FLAGS := \ 
	--extra-packages com.android.voicemail.impl.fetch \

	--extra-packages com.android.voicemail.impl.settings \

	--extra-packages com.android.voicemail.settings \

	--extra-packages me.leolin.shortcutbadger

	--extra-packages me.leolin.shortcutbadger \





LOCAL_STATIC_JAVA_LIBRARIES := \

	android-common \
@@ -260,12 +273,13 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	dialer-disklrucache-target \

	dialer-gifdecoder-target \

	dialer-glide-target \

	dialer-guava-target \

        dialer-grpc-all-target \

        dialer-grpc-context-target \

        dialer-grpc-core-target \

	dialer-grpc-okhttp-target \

	dialer-grpc-protobuf-lite-target \

        dialer-grpc-stub-target \

	dialer-guava-target \

	dialer-javax-annotation-api-target \

	dialer-javax-inject-target \

	dialer-libshortcutbadger-target \
@@ -273,6 +287,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	dialer-mime4j-dom-target \

	jsr305 \

	libphonenumber \

	okhttp \

	volley \



LOCAL_STATIC_ANDROID_LIBRARIES := \
@@ -285,18 +300,18 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
	android-support-v7-recyclerview \



LOCAL_JAVA_LIBRARIES := \

	org.apache.http.legacy \

	dialer-auto-value \

	org.apache.http.legacy \



# Libraries needed by the compiler (JACK) to generate code.

PROCESSOR_LIBRARIES_TARGET := \

	dialer-dagger2-compiler \

	dialer-auto-value \

	dialer-dagger2 \

	dialer-dagger2-compiler \

	dialer-dagger2-producers \

	dialer-guava \

	dialer-javax-annotation-api \

	dialer-javax-inject \

	dialer-auto-value \



# Resolve the jar paths.

PROCESSOR_JARS := $(call java-lib-deps, $(PROCESSOR_LIBRARIES_TARGET))
@@ -308,7 +323,7 @@ LOCAL_JAVACFLAGS += -processorpath $(call normalize-path-list,$(PROCESSOR_JARS)) 




# Begin Bug: 37077388

LOCAL_DX_FLAGS := --core-library --multi-dex

LOCAL_DX_FLAGS := --multi-dex

LOCAL_JACK_FLAGS := --multi-dex native



LOCAL_PROGUARD_ENABLED := disabled
@@ -352,16 +367,16 @@ PROCESSOR_JARS := 
include $(CLEAR_VARS)



LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \

    dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-dagger2:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-all:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-core:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1$(COMMON_JAVA_PACKAGE_SUFFIX)
@@ -531,3 +546,12 @@ include $(BUILD_PREBUILT) 


include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-grpc-context-target

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-context/1.0.3/grpc-context-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)
 
 No newline at end of file

CONTRIBUTING

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
Want to contribute? Great! First, read this page (including the small print at the end).



### Before you contribute

Before we can use your code, you must sign the

[Google Individual Contributor License Agreement]

(https://cla.developers.google.com/about/google-individual)

(CLA), which you can do online. The CLA is necessary mainly because you own the

copyright to your changes, even after your contribution becomes part of our

codebase, so we need your permission to use and distribute your code. We also

need to be sure of various other things—for instance that you'll tell us if you

know that your code infringes on other people's patents. You don't have to sign

the CLA until after you've submitted your code for review and a member has

approved it, but you must do it before we can put your code into our codebase.

Before you start working on a larger contribution, you should get in touch with

us first through the issue tracker with your idea so that we can help out and

possibly guide you. Coordinating up front makes it much easier to avoid

frustration later on.



### Code reviews

All submissions, including submissions by project members, require review. We

use Github pull requests for this purpose.



### The small print

Contributions made by corporations are covered by a different agreement than

the one above, the

[Software Grant and Corporate Contributor License Agreement]

(https://cla.developers.google.com/about/google-corporate).

java/com/android/contacts/common/res/values-uz/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <string name="call_fax_work" msgid="5260192771364592922">"Ish faks raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_fax_home" msgid="5174311195081144124">"Uy faks raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_pager" msgid="6814149227741274161">"Peyjerga qo‘ng‘iroq qilish"</string>

    <string name="call_other" msgid="5536385588712587235">"Qo‘ng‘iroq qilish"</string>

    <string name="call_other" msgid="5536385588712587235">"Chaqiruv"</string>

    <string name="call_callback" msgid="6314019862718112786">"Qayta qo‘ng‘iroq raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_car" msgid="3197417098027764954">"Mashina telefon raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_company_main" msgid="2557663310028446397">"Kompaniya asosiy raqamiga qo‘ng‘iroq qilish"</string>
@@ -40,7 +40,7 @@ 
    <string name="call_work_pager" msgid="3791778749827366574">"Ish peyjeriga qo‘ng‘iroq qilish"</string>

    <string name="call_assistant" msgid="4177478845473789294">"Qo‘ng‘iroq: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>

    <string name="call_mms" msgid="4958811711741872901">"MMS raqamga qo‘ng‘iroq qilish"</string>

    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Qo‘ng‘iroq qilish)"</string>

    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Chaqiruv)"</string>

    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>ga sms jo‘natish"</string>

    <string name="sms_home" msgid="3527719551060295243">"Uy telefoniga sms jo‘natish"</string>

    <string name="sms_mobile" msgid="8883045857887736518">"SMS: mobil"</string>

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

+19 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import com.android.dialer.app.calllog.CallLogActivity; 
import com.android.dialer.app.calllog.CallLogAdapter;

import com.android.dialer.app.calllog.CallLogFragment;

import com.android.dialer.app.calllog.CallLogNotificationsService;

import com.android.dialer.app.calllog.IntentProvider;

import com.android.dialer.app.dialpad.DialpadFragment;

import com.android.dialer.app.list.DialtactsPagerAdapter;

import com.android.dialer.app.list.DialtactsPagerAdapter.TabIndex;
@@ -90,6 +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.callintent.CallIntentBuilder;

import com.android.dialer.callintent.CallSpecificAppData;

import com.android.dialer.common.Assert;
@@ -173,6 +175,7 @@ public class DialtactsActivity extends TransactionSafeActivity 
  private static final int ACTIVITY_REQUEST_CODE_VOICE_SEARCH = 1;

  public static final int ACTIVITY_REQUEST_CODE_CALL_COMPOSE = 2;

  public static final int ACTIVITY_REQUEST_CODE_LIGHTBRINGER = 3;

  public static final int ACTIVITY_REQUEST_CODE_CALL_DETAILS = 4;



  private static final int FAB_SCALE_IN_DELAY_MS = 300;
@@ -789,6 +792,19 @@ public class DialtactsActivity extends TransactionSafeActivity 
      } else {

        LogUtil.i("DialtactsActivity.onActivityResult", "returned from call composer, no error");

      }

    } else if (requestCode == ACTIVITY_REQUEST_CODE_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);

        int snackbarDurationMillis = 5_000;

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

            .setAction(

                R.string.view_conversation,

                v -> startActivity(IntentProvider.getSendSmsIntentProvider(number).getIntent(this)))

            .setActionTextColor(getResources().getColor(R.color.dialer_snackbar_action_text_color))

            .show();

      }

    }

    super.onActivityResult(requestCode, resultCode, data);

  }
@@ -1061,6 +1077,9 @@ public class DialtactsActivity extends TransactionSafeActivity 
      // but it is quickly removed and shown the contacts tab.

      if (mListsFragment != null) {

        mListsFragment.showTab(tabIndex);

        PerformanceReport.setStartingTabIndex(tabIndex);

      } else {

        PerformanceReport.setStartingTabIndex(DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL);

      }

    }

  }

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

+33 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Intent; 
import android.os.Bundle;

import android.provider.CallLog;

import android.provider.CallLog.Calls;

import android.support.design.widget.Snackbar;

import android.support.v13.app.FragmentPagerAdapter;

import android.support.v4.view.ViewPager;

import android.support.v7.app.ActionBar;
@@ -31,7 +32,10 @@ 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.app.calllog.ClearCallLogDialog.Listener;

import com.android.dialer.calldetails.CallDetailsActivity;

import com.android.dialer.database.CallLogQueryHandler;

import com.android.dialer.enrichedcall.EnrichedCallComponent;

import com.android.dialer.logging.Logger;

import com.android.dialer.logging.ScreenEvent;

import com.android.dialer.logging.UiAction;
@@ -42,7 +46,7 @@ import com.android.dialer.util.ViewUtil; 


/** Activity for viewing call history. */

public class CallLogActivity extends TransactionSafeActivity

    implements ViewPager.OnPageChangeListener {

    implements ViewPager.OnPageChangeListener, Listener {



  private static final int TAB_INDEX_ALL = 0;

  private static final int TAB_INDEX_MISSED = 1;
@@ -144,7 +148,7 @@ public class CallLogActivity extends TransactionSafeActivity 
      startActivity(intent);

      return true;

    } else if (item.getItemId() == R.id.delete_all) {

      ClearCallLogDialog.show(getFragmentManager());

      ClearCallLogDialog.show(getFragmentManager(), this);

      return true;

    }

    return super.onOptionsItemSelected(item);
@@ -179,6 +183,15 @@ public class CallLogActivity extends TransactionSafeActivity 
    return position;

  }



  @Override

  public void callHistoryDeleted() {

    if (EnrichedCallComponent.get(this).getEnrichedCallManager().hasStoredData()) {

      Snackbar.make(

              findViewById(R.id.calllog_frame), getString(R.string.multiple_ec_data_deleted), 5_000)

          .show();

    }

  }



  @Override

  public void onBackPressed() {

    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
@@ -229,4 +242,22 @@ public class CallLogActivity extends TransactionSafeActivity 
      return TAB_INDEX_COUNT;

    }

  }



  @Override

  protected void onActivityResult(int requestCode, int resultCode, Intent data) {

    if (requestCode == DialtactsActivity.ACTIVITY_REQUEST_CODE_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);

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

            .setAction(

                R.string.view_conversation,

                v -> startActivity(IntentProvider.getSendSmsIntentProvider(number).getIntent(this)))

            .setActionTextColor(getResources().getColor(R.color.dialer_snackbar_action_text_color))

            .show();

      }

    }

    super.onActivityResult(requestCode, resultCode, data);

  }

}