diff options
author | Ihab Awad <ihab@google.com> | 2014-06-30 21:24:01 -0700 |
---|---|---|
committer | Ihab Awad <ihab@google.com> | 2014-07-02 12:38:30 -0700 |
commit | 1d1bd0da0b32a5b8cb1c7c5585acccb180b19849 (patch) | |
tree | 9bca7648e00e95e177c8fd52fa775f3e16769228 /src/com/android/dialer/CallDetailActivity.java | |
parent | e9b9290142e0e0e767536bc0e8f89f80f7ad3926 (diff) |
Rename Telecomm "Subscription" to "Account" (3/7)
Change-Id: I866e9d4f629a2b23acb3d3d3f2baeb0a674522f7
Diffstat (limited to 'src/com/android/dialer/CallDetailActivity.java')
-rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index d07060111..3735293fc 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -32,7 +32,6 @@ import android.provider.CallLog; import android.provider.CallLog.Calls; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.VoicemailContract.Voicemails; -import android.telecomm.Subscription; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; @@ -196,8 +195,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware CallLog.Calls.COUNTRY_ISO, CallLog.Calls.GEOCODED_LOCATION, CallLog.Calls.NUMBER_PRESENTATION, - CallLog.Calls.SUBSCRIPTION_COMPONENT_NAME, - CallLog.Calls.SUBSCRIPTION_ID, + CallLog.Calls.ACCOUNT_COMPONENT_NAME, + CallLog.Calls.ACCOUNT_ID, }; static final int DATE_COLUMN_INDEX = 0; @@ -207,8 +206,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware static final int COUNTRY_ISO_COLUMN_INDEX = 4; static final int GEOCODED_LOCATION_COLUMN_INDEX = 5; static final int NUMBER_PRESENTATION_COLUMN_INDEX = 6; - static final int SUBSCRIPTION_COMPONENT_NAME = 7; - static final int SUBSCRIPTION_ID = 8; + static final int ACCOUNT_COMPONENT_NAME = 7; + static final int ACCOUNT_ID = 8; @Override protected void onCreate(Bundle icicle) { @@ -487,7 +486,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware final int callType = callCursor.getInt(CALL_TYPE_COLUMN_INDEX); String countryIso = callCursor.getString(COUNTRY_ISO_COLUMN_INDEX); final String geocode = callCursor.getString(GEOCODED_LOCATION_COLUMN_INDEX); - final Drawable subscriptionIcon = getSubscriptionIcon(callCursor); + final Drawable accountIcon = getAccountIcon(callCursor); if (TextUtils.isEmpty(countryIso)) { countryIso = mDefaultCountryIso; @@ -530,7 +529,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware formattedNumber, countryIso, geocode, new int[]{ callType }, date, duration, nameText, numberType, numberLabel, lookupUri, photoUri, sourceType, - subscriptionIcon); + accountIcon); } finally { if (callCursor != null) { callCursor.close(); @@ -539,11 +538,11 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware } /** - * Generate subscription object from data in Telecomm database + * Generate account object from data in Telecomm database */ - private Drawable getSubscriptionIcon(Cursor c) { - final String component_name = c.getString(SUBSCRIPTION_COMPONENT_NAME); - final String subscription_id = c.getString(SUBSCRIPTION_ID); + private Drawable getAccountIcon(Cursor c) { + final String component_name = c.getString(ACCOUNT_COMPONENT_NAME); + final String account_id = c.getString(ACCOUNT_ID); // TODO: actually pull data from the database return null; |