diff options
| author | Santos Cordon <santoscordon@google.com> | 2014-07-14 23:20:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-14 18:38:08 +0000 |
| commit | 2bc98d35f3a491b7bc46c27863d266c38abe5ef0 (patch) | |
| tree | 2d112fec8cf7c0094df3b1c0cc01ad9350c28903 /src/com | |
| parent | a91b9d61eb55751e87af8aab2ba424b9f98fb64f (diff) | |
| parent | 9134e25d7ab8eb687a36ce7ba199e66f44550fdd (diff) | |
| download | android_packages_apps_Dialer-2bc98d35f3a491b7bc46c27863d266c38abe5ef0.tar.gz android_packages_apps_Dialer-2bc98d35f3a491b7bc46c27863d266c38abe5ef0.tar.bz2 android_packages_apps_Dialer-2bc98d35f3a491b7bc46c27863d266c38abe5ef0.zip | |
Merge "Implement multi-SIM capabilities (3/6) [DO NOT MERGE]" into lmp-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 9e6ce01ce..4965647e7 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -47,9 +47,9 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; -import android.view.ViewTreeObserver; import android.view.View.OnDragListener; import android.view.View.OnTouchListener; +import android.view.ViewTreeObserver; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.view.inputmethod.InputMethodManager; @@ -76,11 +76,11 @@ import com.android.dialer.list.DragDropController; import com.android.dialer.list.ListsFragment; import com.android.dialer.list.OnDragDropListener; import com.android.dialer.list.OnListFragmentScrolledListener; -import com.android.dialer.list.SpeedDialFragment; import com.android.dialer.list.PhoneFavoriteSquareTileView; import com.android.dialer.list.RegularSearchFragment; import com.android.dialer.list.SearchFragment; import com.android.dialer.list.SmartDialSearchFragment; +import com.android.dialer.list.SpeedDialFragment; import com.android.dialer.util.DialerUtils; import com.android.dialer.widget.ActionBarController; import com.android.dialer.widget.SearchEditTextLayout; diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 2987c9e4e..5bebd4030 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -28,6 +28,7 @@ import android.os.Message; import android.provider.CallLog.Calls; import android.provider.ContactsContract.PhoneLookup; import android.telecomm.PhoneAccount; +import android.telecomm.TelecommManager; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -632,8 +633,8 @@ public class CallLogAdapter extends GroupingListAdapter final long duration = c.getLong(CallLogQuery.DURATION); final int callType = c.getInt(CallLogQuery.CALL_TYPE); final PhoneAccount account = getAccount(c); - final Drawable accountIcon = account != null? - account.getIcon(mContext) : null; + final Drawable accountIcon = account == null ? null : + TelecommManager.from(mContext).getPhoneAccountMetadata(account).getIcon(mContext); final String countryIso = c.getString(CallLogQuery.COUNTRY_ISO); final long rowId = c.getLong(CallLogQuery.ID); views.rowId = rowId; |