Rename PhoneAccountMetadata to PhoneAccount
Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 51cc95b..e831441 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -644,9 +644,9 @@
final long date = c.getLong(CallLogQuery.DATE);
final long duration = c.getLong(CallLogQuery.DURATION);
final int callType = c.getInt(CallLogQuery.CALL_TYPE);
- final PhoneAccountHandle account = getAccount(c);
- final Drawable accountIcon = account == null ? null :
- TelecommManager.from(mContext).getPhoneAccountMetadata(account).getIcon(mContext);
+ final PhoneAccountHandle accountHandle = getAccountHandle(c);
+ final Drawable accountIcon = accountHandle == null ? null :
+ TelecommManager.from(mContext).getPhoneAccount(accountHandle).getIcon(mContext);
final String countryIso = c.getString(CallLogQuery.COUNTRY_ISO);
final long rowId = c.getLong(CallLogQuery.ID);
views.rowId = rowId;
@@ -671,7 +671,7 @@
views.number = number;
views.numberPresentation = numberPresentation;
views.callType = callType;
- views.mAccount = account;
+ views.mAccountHandle = accountHandle;
views.voicemailUri = c.getString(CallLogQuery.VOICEMAIL_URI);
// Stash away the Ids of the calls so that we can support deleting a row in the call log.
views.callIds = getCallIds(c, count);
@@ -690,7 +690,7 @@
if (PhoneNumberUtilsWrapper.canPlaceCallsTo(number, numberPresentation)) {
// Sets the primary action to call the number.
views.primaryActionView.setTag(IntentProvider.getReturnCallIntentProvider(number,
- account));
+ accountHandle));
} else {
// Number is not callable, so hide button.
views.primaryActionView.setTag(null);
@@ -980,7 +980,7 @@
if (canPlaceCallToNumber) {
// Sets the primary action to call the number.
views.callBackButtonView.setTag(
- IntentProvider.getReturnCallIntentProvider(views.number, views.mAccount));
+ IntentProvider.getReturnCallIntentProvider(views.number, views.mAccountHandle));
views.callBackButtonView.setVisibility(View.VISIBLE);
views.callBackButtonView.setOnClickListener(mActionListener);
} else {
@@ -993,7 +993,7 @@
if (canPlaceCallToNumber && views.phoneCallDetailsViews.callTypeIcons.isVideoShown()) {
views.videoCallButtonView.setTag(
IntentProvider.getReturnVideoCallIntentProvider(views.number,
- views.mAccount));
+ views.mAccountHandle));
views.videoCallButtonView.setVisibility(View.VISIBLE);
views.videoCallButtonView.setOnClickListener(mActionListener);
} else {
@@ -1262,7 +1262,7 @@
return features;
}
- private PhoneAccountHandle getAccount(Cursor c) {
+ private PhoneAccountHandle getAccountHandle(Cursor c) {
final String component_name = c.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);
final String account_id = c.getString(CallLogQuery.ACCOUNT_ID);
diff --git a/src/com/android/dialer/calllog/CallLogListItemViews.java b/src/com/android/dialer/calllog/CallLogListItemViews.java
index b5b063c..21e0cb0 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViews.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViews.java
@@ -87,7 +87,7 @@
* The account for the current call log entry. Cached here as the call back
* intent is set only when the actions ViewStub is inflated.
*/
- public PhoneAccountHandle mAccount;
+ public PhoneAccountHandle mAccountHandle;
/**
* If the call has an associated voicemail message, the URI of the voicemail message for
diff --git a/src/com/android/dialer/calllog/IntentProvider.java b/src/com/android/dialer/calllog/IntentProvider.java
index 0bf7084..517d9e7 100644
--- a/src/com/android/dialer/calllog/IntentProvider.java
+++ b/src/com/android/dialer/calllog/IntentProvider.java
@@ -38,21 +38,21 @@
public abstract Intent getIntent(Context context);
public static IntentProvider getReturnCallIntentProvider(final String number,
- final PhoneAccountHandle account) {
+ final PhoneAccountHandle accountHandle) {
return new IntentProvider() {
@Override
public Intent getIntent(Context context) {
- return CallUtil.getCallIntent(number, account);
+ return CallUtil.getCallIntent(number, accountHandle);
}
};
}
public static IntentProvider getReturnVideoCallIntentProvider(final String number,
- final PhoneAccountHandle account) {
+ final PhoneAccountHandle accountHandle) {
return new IntentProvider() {
@Override
public Intent getIntent(Context context) {
- return CallUtil.getVideoCallIntent(number, account);
+ return CallUtil.getVideoCallIntent(number, accountHandle);
}
};
}
diff --git a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
index b8333cc..81a4249 100644
--- a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
+++ b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
@@ -399,11 +399,11 @@
private PhoneAccountHandle getManualAccount() {
TelecommManager telecommManager = TelecommManager.from(this);
- List <PhoneAccountHandle> accounts = telecommManager.getEnabledPhoneAccounts();
+ List <PhoneAccountHandle> accountHandles = telecommManager.getEnabledPhoneAccounts();
if (mAccount0.isChecked()) {
- return accounts.get(0);
+ return accountHandles.get(0);
} else if (mAccount1.isChecked()){
- return accounts.get(1);
+ return accountHandles.get(1);
} else {
return null;
}