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

Commit d1d9524c authored by twyen's avatar twyen Committed by android-build-merger
Browse files

Merge changes If56cc9f1,I95bfcb59,I62021e0f am: 0ec224dd am: 8983e9ef 

am: cb3c124d

Change-Id: I8347c3aed91f7208d9a81ec9eb4e12ef7e5673b1
parents 94c35ef9 cb3c124d

java/com/android/contacts/common/dialog/CallSubjectDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ import android.widget.EditText; 
import android.widget.ListView;

import android.widget.QuickContactBadge;

import android.widget.TextView;

import com.android.contacts.common.R;

import com.android.dialer.animation.AnimUtils;

import com.android.dialer.callintent.CallInitiationType;

import com.android.dialer.callintent.CallIntentBuilder;

import com.android.dialer.common.LogUtil;

import com.android.dialer.contactphoto.ContactPhotoManager;

import com.android.dialer.contacts.resources.R;

import com.android.dialer.lettertile.LetterTileDrawable;

import com.android.dialer.precall.PreCall;

import com.android.dialer.util.ViewUtil;

java/com/android/contacts/common/dialog/ClearFrequentsDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.content.DialogInterface.OnClickListener; 
import android.os.AsyncTask;

import android.os.Bundle;

import android.provider.ContactsContract;

import com.android.contacts.common.R;

import com.android.dialer.contacts.resources.R;

import com.android.dialer.util.PermissionsUtil;



/** Dialog that clears the frequently contacted list after confirming with the user. */

java/com/android/contacts/common/list/ContactTileView.java

+1 −1
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import android.view.View; 
import android.widget.FrameLayout;

import android.widget.ImageView;

import com.android.contacts.common.MoreContactUtils;

import com.android.contacts.common.R;

import com.android.dialer.callintent.CallInitiationType;

import com.android.dialer.callintent.CallSpecificAppData;

import com.android.dialer.common.LogUtil;

import com.android.dialer.contactphoto.ContactPhotoManager;

import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;

import com.android.dialer.contacts.resources.R;

import com.android.dialer.widget.BidiTextView;



/** A ContactTile displays a contact's picture and name */

java/com/android/contacts/common/list/ViewPagerTabStrip.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.graphics.Paint; 
import android.util.AttributeSet;

import android.view.View;

import android.widget.LinearLayout;

import com.android.contacts.common.R;

import com.android.dialer.contacts.resources.R;

import com.android.dialer.theme.base.ThemeComponent;



public class ViewPagerTabStrip extends LinearLayout {

java/com/android/contacts/common/list/ViewPagerTabs.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.widget.HorizontalScrollView; 
import android.widget.LinearLayout;

import android.widget.TextView;

import android.widget.Toast;

import com.android.contacts.common.R;

import com.android.dialer.contacts.resources.R;



/**

 * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs,