diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-16 02:46:02 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-16 02:46:02 -0700 |
commit | ee43a088fd06e8b2788380253b5f6591280e6334 (patch) | |
tree | 4a08cd45edaa3a0f79b25930c3dbcb0eb41a7d5e | |
parent | cafd87d3eb7612ba23a8019fc27d84b13873f616 (diff) | |
parent | 0bdb14f57133bee5b52505a9a107f706799cee38 (diff) | |
download | android_packages_apps_Dialer-ee43a088fd06e8b2788380253b5f6591280e6334.tar.gz android_packages_apps_Dialer-ee43a088fd06e8b2788380253b5f6591280e6334.tar.bz2 android_packages_apps_Dialer-ee43a088fd06e8b2788380253b5f6591280e6334.zip |
Merge "Dialer: fix compilation errors"
-rwxr-xr-x[-rw-r--r--] | src/com/android/dialer/DialtactsActivity.java | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | src/com/android/dialer/PhoneCallDetailsHelper.java | 25 | ||||
-rwxr-xr-x | src/com/android/dialer/calllog/CallLogActivity.java | 2 | ||||
-rwxr-xr-x | src/com/android/dialer/calllog/CallLogAdapter.java | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java | 2 |
6 files changed, 32 insertions, 9 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 374b68a2c..475d398ae 100644..100755 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -843,7 +843,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O /** * Finishes hiding the dialpad fragment after any animations are completed. */ - private void commitDialpadFragmentHide() { + public void commitDialpadFragmentHide() { if (!mStateSaved && !mDialpadFragment.isHidden()) { final FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.hide(mDialpadFragment); diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index 031a87737..1956085c5 100644..100755 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -16,6 +16,7 @@ package com.android.dialer; +import android.content.Context; import android.content.res.Resources; import android.provider.CallLog; import android.provider.CallLog.Calls; @@ -50,6 +51,7 @@ public class PhoneCallDetailsHelper { /** The maximum number of icons will be shown to represent the call types in a group. */ private static final int MAX_CALL_TYPE_ICONS = 3; + private final Context mContext; private final Resources mResources; /** The injected current time in milliseconds since the epoch. Used only by tests. */ private Long mCurrentTimeMillisForTest; @@ -69,8 +71,9 @@ public class PhoneCallDetailsHelper { * * @param resources used to look up strings */ - public PhoneCallDetailsHelper(Resources resources, CallTypeHelper callTypeHelper, + public PhoneCallDetailsHelper(Context context, Resources resources, PhoneNumberUtilsWrapper phoneUtils) { + mContext = context; mResources = resources; mPhoneNumberUtilsWrapper = phoneUtils; mPhoneNumberHelper = new PhoneNumberDisplayHelper(mPhoneNumberUtilsWrapper, resources); @@ -114,9 +117,24 @@ public class PhoneCallDetailsHelper { // Set the call count, location and date. setCallCountAndDate(views, callCount, callLocationAndDate); - // Set the account label if it exists. - String accountLabel = PhoneAccountUtils.getAccountLabel(mContext, details.accountHandle); + // set the account icon if it exists + if (details.accountIcon != null) { + if (MoreContactUtils.shouldShowOperator(mResources)) { + views.operator.setVisibility(View.VISIBLE); + views.operator.setText(details.operator); + views.callAccountIcon.setVisibility(View.GONE); + } else { + views.operator.setVisibility(View.GONE); + views.callAccountIcon.setVisibility(View.VISIBLE); + views.callAccountIcon.setImageDrawable(details.accountIcon); + } + } else { + views.callAccountIcon.setVisibility(View.GONE); + } + /* + // Set the account label if it exists. + String accountLabel = details.accountLabel; if (accountLabel != null) { views.callAccountLabel.setVisibility(View.VISIBLE); views.callAccountLabel.setText(accountLabel); @@ -130,6 +148,7 @@ public class PhoneCallDetailsHelper { } else { views.callAccountLabel.setVisibility(View.GONE); } + */ CharSequence nameText; CharSequence displayNumber = diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java index 210795ed7..2e55974fb 100755 --- a/src/com/android/dialer/calllog/CallLogActivity.java +++ b/src/com/android/dialer/calllog/CallLogActivity.java @@ -86,7 +86,7 @@ public class CallLogActivity extends AnalyticsActivity implements @Override public Object instantiateItem(ViewGroup container, int position) { - final Fragment fragment = super.instantiateItem(container, position); + final Object fragment = super.instantiateItem(container, position); switch (position) { case TAB_INDEX_MSIM: mMSimCallsFragment = (MSimCallLogFragment)fragment; diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index b75461059..e501931eb 100755 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -24,6 +24,7 @@ import android.content.Loader; import android.content.res.Resources; import android.database.Cursor; import android.database.sqlite.SQLiteFullException; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.provider.CallLog.Calls; import android.provider.ContactsContract; @@ -232,7 +233,6 @@ public class CallLogAdapter extends GroupingListAdapter Toast.LENGTH_SHORT); Resources resources = mContext.getResources(); - CallTypeHelper callTypeHelper = new CallTypeHelper(resources); mCallLogBackgroundColor = resources.getColor(R.color.background_dialer_list_items); mExpandedBackgroundColor = resources.getColor(R.color.call_log_expanded_background_color); mExpandedTranslationZ = resources.getDimension(R.dimen.call_log_expanded_translation_z); @@ -242,7 +242,7 @@ public class CallLogAdapter extends GroupingListAdapter mAdapterHelper = new CallLogAdapterHelper(context, this, contactInfoHelper, mPhoneNumberHelper); PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper( - resources, callTypeHelper, new PhoneNumberUtilsWrapper()); + mContext, resources, new PhoneNumberUtilsWrapper()); mCallLogViewsHelper = new CallLogListItemHelper( phoneCallDetailsHelper, mPhoneNumberHelper, resources); @@ -1103,6 +1103,10 @@ public class CallLogAdapter extends GroupingListAdapter } } + public void setQueryString(String filter) { + mFilterString = filter; + } + /** * Invokes the "add contact" activity given the expanded contact information stored in a * lookup URI. This can include, for example, address and website information. diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java index bc7c033b2..1669b5087 100644..100755 --- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java +++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java @@ -69,7 +69,7 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { CallTypeHelper callTypeHelper = new CallTypeHelper(resources); final TestPhoneNumberUtilsWrapper phoneUtils = new TestPhoneNumberUtilsWrapper( TEST_VOICEMAIL_NUMBER); - mHelper = new PhoneCallDetailsHelper(resources, callTypeHelper, phoneUtils); + mHelper = new PhoneCallDetailsHelper(context, resources, phoneUtils); mHelper.setCurrentTimeForTest( new GregorianCalendar(2011, 5, 4, 13, 0, 0).getTimeInMillis()); mViews = PhoneCallDetailsViews.createForTest(context); diff --git a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java index 85dbf8c83..feed379e7 100644..100755 --- a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java @@ -64,7 +64,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase { final TestPhoneNumberUtilsWrapper phoneUtils = new TestPhoneNumberUtilsWrapper( TEST_VOICEMAIL_NUMBER); PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper( - mResources, callTypeHelper, phoneUtils); + context, mResources, phoneUtils); mPhoneNumberDisplayHelper = new PhoneNumberDisplayHelper(mResources); mHelper = new CallLogListItemHelper(phoneCallDetailsHelper, mPhoneNumberDisplayHelper, mResources); |