summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xres/values-zh-rCN/strings.xml2
-rw-r--r--res/values-zh-rTW/strings.xml2
-rw-r--r--res/values/config.xml1
-rw-r--r--res/values/strings.xml3
-rwxr-xr-x[-rw-r--r--]src/com/android/dialer/CallDetailActivity.java8
-rwxr-xr-x[-rw-r--r--]src/com/android/dialer/PhoneCallDetails.java8
-rwxr-xr-x[-rw-r--r--]src/com/android/dialer/calllog/CallDetailHistoryAdapter.java24
-rwxr-xr-xsrc/com/android/dialer/calllog/CallLogAdapter.java6
-rwxr-xr-x[-rw-r--r--]src/com/android/dialer/calllog/CallLogQuery.java6
-rwxr-xr-xtests/src/com/android/dialer/PhoneCallDetailsHelperTest.java14
-rwxr-xr-xtests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java51
11 files changed, 87 insertions, 38 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a66620de4..8844089fb 100755
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -48,6 +48,8 @@
<string name="call_log_incoming_header" msgid="2787722299753674684">"只显示来电"</string>
<string name="call_log_outgoing_header" msgid="761009180766735769">"只显示外拨电话"</string>
<string name="call_log_missed_header" msgid="8017148056610855956">"只显示未接来电"</string>
+ <string name="call_duration_active">"通话时长:"</string>
+ <string name="call_duration_call_out">"呼叫时长:"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"无法连接到语音信箱服务器。"</string>
<string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"无法连接到语音信箱服务器。新的语音邮件正在等待接收。"</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"设置您的语音信箱。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c3ee7189b..bb84dd9b9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -48,6 +48,8 @@
<string name="call_log_incoming_header" msgid="2787722299753674684">"僅顯示來電"</string>
<string name="call_log_outgoing_header" msgid="761009180766735769">"僅顯示已撥電話"</string>
<string name="call_log_missed_header" msgid="8017148056610855956">"僅顯示未接來電"</string>
+ <string name="call_duration_active">"通話時長:"</string>
+ <string name="call_duration_call_out">"呼叫時長:"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"無法連線至語音信箱伺服器。"</string>
<string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"無法連線至語音信箱伺服器，新的語音留言仍待聽取。"</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"設定您的語音信箱。"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index e8b6eca2b..318916dfa 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,4 +17,5 @@
<resources>
<bool name="call_recording_enabled">false</bool>
<integer name="call_recording_audio_source">1</integer>
+ <bool name="call_durationtype_enabled">false</bool>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e9988756..c58e916e3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -133,6 +133,9 @@
<!-- The header to show that call log is only showing missed calls. [CHAR LIMIT=40] -->
<string name="call_log_missed_header">Missed calls only</string>
+ <string name="call_duration_active">Active duration:</string>
+ <string name="call_duration_call_out">Call duration:</string>
+
<!-- Voicemail status message shown at the top of call log to notify the user that no new
voicemails are currently available. This can happen when both notification as well as data
connection to the voicemail server is lost. [CHAR LIMIT=64] -->
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 2bfbe8211..fad0c8841 100644..100755
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -200,7 +200,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
CallLog.Calls.COUNTRY_ISO,
CallLog.Calls.GEOCODED_LOCATION,
CallLog.Calls.NUMBER_PRESENTATION,
- CallLog.Calls.SUBSCRIPTION
+ CallLog.Calls.SUBSCRIPTION,
+ CallLog.Calls.DURATION_TYPE
};
static final int DATE_COLUMN_INDEX = 0;
@@ -211,6 +212,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
static final int GEOCODED_LOCATION_COLUMN_INDEX = 5;
static final int NUMBER_PRESENTATION_COLUMN_INDEX = 6;
static final int SUBSCRIPTION = 7;
+ static final int DURATION_TYPE_COLUMN_INDEX = 8;
@Override
protected void onCreate(Bundle icicle) {
@@ -473,6 +475,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
String countryIso = callCursor.getString(COUNTRY_ISO_COLUMN_INDEX);
final String geocode = callCursor.getString(GEOCODED_LOCATION_COLUMN_INDEX);
final int subscription = callCursor.getInt(SUBSCRIPTION);
+ int durationType = callCursor.getInt(DURATION_TYPE_COLUMN_INDEX);
if (TextUtils.isEmpty(countryIso)) {
countryIso = mDefaultCountryIso;
@@ -514,7 +517,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
return new PhoneCallDetails(number, numberPresentation,
formattedNumber, countryIso, geocode,
new int[]{ callType }, date, duration,
- nameText, numberType, numberLabel, lookupUri, photoUri, sourceType, subscription);
+ nameText, numberType, numberLabel, lookupUri, photoUri, sourceType,
+ subscription, durationType);
} finally {
if (callCursor != null) {
callCursor.close();
diff --git a/src/com/android/dialer/PhoneCallDetails.java b/src/com/android/dialer/PhoneCallDetails.java
index 06e3aa0d5..f1393954c 100644..100755
--- a/src/com/android/dialer/PhoneCallDetails.java
+++ b/src/com/android/dialer/PhoneCallDetails.java
@@ -66,13 +66,14 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
/** The subscription of the call. */
public final int subscription;
+ public final int durationType;
/** Create the details for a call with a number not associated with a contact. */
public PhoneCallDetails(CharSequence number, int numberPresentation,
CharSequence formattedNumber, String countryIso, String geocode,
- int[] callTypes, long date, long duration, int subscription) {
+ int[] callTypes, long date, long duration, int subscription, int durationType) {
this(number, numberPresentation, formattedNumber, countryIso, geocode,
- callTypes, date, duration, "", 0, "", null, null, 0, subscription);
+ callTypes, date, duration, "", 0, "", null, null, 0, subscription, durationType);
}
/** Create the details for a call with a number associated with a contact. */
@@ -80,7 +81,7 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
CharSequence formattedNumber, String countryIso, String geocode,
int[] callTypes, long date, long duration, CharSequence name,
int numberType, CharSequence numberLabel, Uri contactUri,
- Uri photoUri, int sourceType, int subscription) {
+ Uri photoUri, int sourceType, int subscription, int durationType) {
this.number = number;
this.numberPresentation = numberPresentation;
this.formattedNumber = formattedNumber;
@@ -96,6 +97,7 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
this.photoUri = photoUri;
this.sourceType = sourceType;
this.subscription = subscription;
+ this.durationType = durationType;
}
@Override
diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
index ee18f1ee4..889327e74 100644..100755
--- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
+++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
@@ -181,7 +181,7 @@ public class CallDetailHistoryAdapter extends BaseAdapter {
durationView.setVisibility(View.GONE);
} else {
durationView.setVisibility(View.VISIBLE);
- durationView.setText(formatDuration(details.duration));
+ durationView.setText(formatDuration(details.duration, details.durationType));
}
// do this synchronously to prevent recordings from "popping in"
@@ -203,7 +203,7 @@ public class CallDetailHistoryAdapter extends BaseAdapter {
return result;
}
- private String formatDuration(long elapsedSeconds) {
+ private String formatDuration(long elapsedSeconds, int durationType) {
long minutes = 0;
long seconds = 0;
@@ -213,6 +213,24 @@ public class CallDetailHistoryAdapter extends BaseAdapter {
}
seconds = elapsedSeconds;
- return mContext.getString(R.string.callDetailsDurationFormat, minutes, seconds);
+ String timeStr = mContext.getString(R.string.callDetailsDurationFormat,
+ minutes, seconds);
+
+ boolean duration = mContext.getResources().getBoolean(R.bool.call_durationtype_enabled);
+
+ if (duration) {
+ switch (durationType) {
+ case Calls.DURATION_TYPE_ACTIVE:
+ return mContext.getString(R.string.call_duration_active)
+ + timeStr;
+ case Calls.DURATION_TYPE_CALLOUT:
+ return mContext.getString(R.string.call_duration_call_out)
+ + timeStr;
+ default:
+ return timeStr;
+ }
+ } else {
+ return timeStr;
+ }
}
}
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 5b779840f..26664fddd 100755
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -249,6 +249,7 @@ public class CallLogAdapter extends GroupingListAdapter
final int callType = c.getInt(CallLogQuery.CALL_TYPE);
final String countryIso = c.getString(CallLogQuery.COUNTRY_ISO);
final int subscription = c.getInt(CallLogQuery.SUBSCRIPTION);
+ final int durationType = c.getInt(CallLogQuery.DURATION_TYPE);
final ContactInfo cachedContactInfo = getContactInfoFromCallLog(c);
@@ -310,11 +311,12 @@ public class CallLogAdapter extends GroupingListAdapter
if (TextUtils.isEmpty(name)) {
details = new PhoneCallDetails(number, numberPresentation,
formattedNumber, countryIso, geocode, callTypes, date,
- duration, subscription);
+ duration, subscription, durationType);
} else {
details = new PhoneCallDetails(number, numberPresentation,
formattedNumber, countryIso, geocode, callTypes, date,
- duration, name, ntype, label, lookupUri, photoUri, sourceType, subscription);
+ duration, name, ntype, label, lookupUri, photoUri, sourceType,
+ subscription, durationType);
}
final boolean isNew = c.getInt(CallLogQuery.IS_READ) == 0;
diff --git a/src/com/android/dialer/calllog/CallLogQuery.java b/src/com/android/dialer/calllog/CallLogQuery.java
index 72fe69927..c90db69cf 100644..100755
--- a/src/com/android/dialer/calllog/CallLogQuery.java
+++ b/src/com/android/dialer/calllog/CallLogQuery.java
@@ -44,7 +44,8 @@ public final class CallLogQuery {
Calls.CACHED_FORMATTED_NUMBER, // 15
Calls.IS_READ, // 16
Calls.NUMBER_PRESENTATION, // 17
- Calls.SUBSCRIPTION // 18
+ Calls.SUBSCRIPTION, // 18
+ Calls.DURATION_TYPE // 19
};
public static final int ID = 0;
@@ -65,5 +66,6 @@ public final class CallLogQuery {
public static final int CACHED_FORMATTED_NUMBER = 15;
public static final int IS_READ = 16;
public static final int NUMBER_PRESENTATION = 17;
- public static final int SUBSCRIPTION = 18;
+ public static final int SUBSCRIPTION = 18;
+ public static final int DURATION_TYPE = 19;
}
diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java
index 18800c0e0..de204c411 100755
--- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java
+++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java
@@ -56,6 +56,8 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase {
/** Empty geocode label */
private static final String EMPTY_GEOCODE = "";
+ private static final int TEST_DURATIONTYPE = 0;
+
/** The object under test. */
private PhoneCallDetailsHelper mHelper;
/** The views to fill. */
@@ -294,7 +296,7 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase {
new PhoneCallDetails(number, presentation, formattedNumber,
TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{ Calls.VOICEMAIL_TYPE }, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION),
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
true);
}
@@ -305,7 +307,7 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase {
new PhoneCallDetails(number, Calls.PRESENTATION_ALLOWED,
formattedNumber, TEST_COUNTRY_ISO, geocodedLocation,
new int[]{ Calls.VOICEMAIL_TYPE }, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION),
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
true);
}
@@ -315,7 +317,7 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase {
new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{ Calls.INCOMING_TYPE }, date, TEST_DURATION,
- TEST_SUBSCRIPTION),
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
false);
}
@@ -324,7 +326,7 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase {
mHelper.setPhoneCallDetails(mViews,
new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
- callTypes, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION),
+ callTypes, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
false);
}
@@ -333,7 +335,7 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase {
new PhoneCallDetails(number, presentation,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{ Calls.INCOMING_TYPE }, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION));
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE));
}
private void setCallDetailsHeader(String name) {
@@ -341,6 +343,6 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase {
new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{ Calls.INCOMING_TYPE }, TEST_DATE, TEST_DURATION,
- name, 0, "", null, null, 0, TEST_SUBSCRIPTION));
+ name, 0, "", null, null, 0, TEST_SUBSCRIPTION, TEST_DURATIONTYPE));
}
}
diff --git a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
index 56be6a458..8e97ec13c 100755
--- a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
@@ -46,6 +46,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
private static final String TEST_COUNTRY_ISO = "US";
/** The geocoded location used in the tests. */
private static final String TEST_GEOCODE = "United States";
+ private static final int TEST_DURATIONTYPE = 0;
/** The object under test. */
private CallLogListItemHelper mHelper;
@@ -173,7 +174,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
public void testGetCallDescriptionID_UnknownAnswered() {
PhoneCallDetails details = new PhoneCallDetails("", Calls.PRESENTATION_UNKNOWN, "",
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
assertEquals(R.string.description_unknown_answered_call,
mHelper.getCallDescriptionStringID(details));
}
@@ -185,7 +187,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
public void testGetCallDescriptionID_UnknownMissed() {
PhoneCallDetails details = new PhoneCallDetails("", Calls.PRESENTATION_UNKNOWN, "",
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.MISSED_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.MISSED_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
assertEquals(R.string.description_unknown_missed_call,
mHelper.getCallDescriptionStringID(details));
}
@@ -197,7 +200,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
public void testGetCallDescriptionID_UnknownVoicemail() {
PhoneCallDetails details = new PhoneCallDetails("", Calls.PRESENTATION_UNKNOWN, "",
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
assertEquals(R.string.description_unknown_missed_call,
mHelper.getCallDescriptionStringID(details));
}
@@ -210,7 +214,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
assertEquals(R.string.description_return_answered_call,
mHelper.getCallDescriptionStringID(details));
}
@@ -223,7 +228,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.MISSED_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.MISSED_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
assertEquals(R.string.description_return_missed_call,
mHelper.getCallDescriptionStringID(details));
}
@@ -236,7 +242,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
assertEquals(R.string.description_return_missed_call,
mHelper.getCallDescriptionStringID(details));
}
@@ -250,7 +257,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
assertEquals(R.string.description_call_last,
mHelper.getCallDescriptionStringID(details));
}
@@ -265,7 +273,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{Calls.OUTGOING_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION);
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE);
assertEquals(R.string.description_call_last_multiple,
mHelper.getCallDescriptionStringID(details));
}
@@ -279,7 +287,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{Calls.OUTGOING_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION);
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE);
CharSequence description = mHelper.getCallDescription(details);
assertFalse(description.toString()
.contains(this.mResources.getString(R.string.description_new_voicemail)));
@@ -294,7 +302,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{Calls.INCOMING_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION);
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE);
CharSequence description = mHelper.getCallDescription(details);
assertFalse(description.toString()
.contains(this.mResources.getString(R.string.description_new_voicemail)));
@@ -309,7 +317,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{Calls.MISSED_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION);
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE);
CharSequence description = mHelper.getCallDescription(details);
assertFalse(description.toString()
.contains(this.mResources.getString(R.string.description_new_voicemail)));
@@ -324,7 +332,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{Calls.VOICEMAIL_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION);
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE);
CharSequence description = mHelper.getCallDescription(details);
assertTrue(description.toString()
.contains(this.mResources.getString(R.string.description_new_voicemail)));
@@ -338,7 +346,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION);
+ new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE);
CharSequence description = mHelper.getCallDescription(details);
// Rather than hard coding the "X calls" string message, we'll generate it with an empty
@@ -358,7 +367,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
TEST_FORMATTED_NUMBER,
TEST_COUNTRY_ISO, TEST_GEOCODE,
new int[]{Calls.VOICEMAIL_TYPE, Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION,
- TEST_SUBSCRIPTION);
+ TEST_SUBSCRIPTION, TEST_DURATIONTYPE);
CharSequence description = mHelper.getCallDescription(details);
assertTrue(description.toString()
.contains(this.mResources.getString(R.string.description_num_calls, 2)));
@@ -391,7 +400,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
mHelper.setPhoneCallDetails(mViews,
new PhoneCallDetails(number, presentation, formattedNumber,
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{ callType }, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION),
+ new int[]{ callType }, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE),
false, false);
}
@@ -401,7 +411,8 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
mHelper.setPhoneCallDetails(mViews,
new PhoneCallDetails(number, presentation, formattedNumber,
TEST_COUNTRY_ISO, TEST_GEOCODE,
- new int[]{ callType }, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION),
+ new int[]{ callType }, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION,
+ TEST_DURATIONTYPE),
false, true);
}
@@ -410,7 +421,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
mHelper.setPhoneCallDetails(mViews,
new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
- types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION),
+ types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
false, false);
}
@@ -419,7 +430,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
mHelper.setPhoneCallDetails(mViews,
new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
- types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION),
+ types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
false, true);
}
@@ -428,7 +439,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
mHelper.setPhoneCallDetails(mViews,
new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
- types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION),
+ types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
true, false);
}
@@ -439,7 +450,7 @@ public class CallLogListItemHelperTest extends AndroidTestCase {
mHelper.setPhoneCallDetails(mViews,
new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE,
- types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION),
+ types, TEST_DATE, TEST_DURATION, TEST_SUBSCRIPTION, TEST_DURATIONTYPE),
true, true);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 21:17:05 +0000