diff options
19 files changed, 327 insertions, 52 deletions
diff --git a/res/drawable-hdpi/ic_videocam_wht_24dp.png b/res/drawable-hdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..ecfce9446 --- /dev/null +++ b/res/drawable-hdpi/ic_videocam_wht_24dp.png diff --git a/res/drawable-mdpi/ic_videocam_wht_24dp.png b/res/drawable-mdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..cbb5be2ea --- /dev/null +++ b/res/drawable-mdpi/ic_videocam_wht_24dp.png diff --git a/res/drawable-xhdpi/ic_videocam_wht_24dp.png b/res/drawable-xhdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..814e515bc --- /dev/null +++ b/res/drawable-xhdpi/ic_videocam_wht_24dp.png diff --git a/res/drawable-xxhdpi/ic_videocam_wht_24dp.png b/res/drawable-xxhdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..c21679891 --- /dev/null +++ b/res/drawable-xxhdpi/ic_videocam_wht_24dp.png diff --git a/res/values/strings.xml b/res/values/strings.xml index 2a815261e..13fdf75c5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -737,4 +737,8 @@ Note: AccessibilityServices uses this attribute to announce the purpose of the button. [CHAR LIMIT=NONE] --> <string name="voicemail_play_start_pause">Start or pause playback.</string> + + <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". + [CHAR LIMIT=3] --> + <string name="list_delimeter">", "</string> </resources> diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index fa8d5ed28..3ef78af5c 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -50,6 +50,7 @@ import com.android.contacts.common.CallUtil; import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest; import com.android.contacts.common.GeoUtil; import com.android.dialer.calllog.CallDetailHistoryAdapter; +import com.android.dialer.calllog.CallLogQuery; import com.android.dialer.calllog.CallTypeHelper; import com.android.dialer.calllog.ContactInfo; import com.android.dialer.calllog.ContactInfoHelper; @@ -197,6 +198,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware CallLog.Calls.NUMBER_PRESENTATION, CallLog.Calls.PHONE_ACCOUNT_COMPONENT_NAME, CallLog.Calls.PHONE_ACCOUNT_ID, + CallLog.Calls.FEATURES, + CallLog.Calls.DATA_USAGE }; static final int DATE_COLUMN_INDEX = 0; @@ -208,6 +211,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware static final int NUMBER_PRESENTATION_COLUMN_INDEX = 6; static final int ACCOUNT_COMPONENT_NAME = 7; static final int ACCOUNT_ID = 8; + static final int FEATURES = 9; + static final int DATA_USAGE = 10; @Override protected void onCreate(Bundle icicle) { @@ -525,11 +530,16 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware lookupUri = info.lookupUri; sourceType = info.sourceType; } + final int features = callCursor.getInt(FEATURES); + Long dataUsage = null; + if (!callCursor.isNull(DATA_USAGE)) { + dataUsage = callCursor.getLong(DATA_USAGE); + } return new PhoneCallDetails(number, numberPresentation, formattedNumber, countryIso, geocode, new int[]{ callType }, date, duration, nameText, numberType, numberLabel, lookupUri, photoUri, sourceType, - accountIcon); + accountIcon, features, dataUsage); } finally { if (callCursor != null) { callCursor.close(); diff --git a/src/com/android/dialer/PhoneCallDetails.java b/src/com/android/dialer/PhoneCallDetails.java index afdb2e303..0dc6fd3e6 100644 --- a/src/com/android/dialer/PhoneCallDetails.java +++ b/src/com/android/dialer/PhoneCallDetails.java @@ -68,13 +68,23 @@ public class PhoneCallDetails { * The unique identifier for the provider associated with the call. */ public final Drawable accountIcon; + /** + * Features applicable to this call. + */ + public final int features; + /** + * Total data usage for this call. + */ + public final Long dataUsage; /** 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, Drawable accountIcon) { + int[] callTypes, long date, long duration, Drawable accountIcon, int features, + Long dataUsage) { this(number, numberPresentation, formattedNumber, countryIso, geocode, - callTypes, date, duration, "", 0, "", null, null, 0, accountIcon); + callTypes, date, duration, "", 0, "", null, null, 0, accountIcon, features, + dataUsage); } /** Create the details for a call with a number associated with a contact. */ @@ -82,7 +92,7 @@ public class PhoneCallDetails { CharSequence formattedNumber, String countryIso, String geocode, int[] callTypes, long date, long duration, CharSequence name, int numberType, CharSequence numberLabel, Uri contactUri, - Uri photoUri, int sourceType, Drawable accountIcon) { + Uri photoUri, int sourceType, Drawable accountIcon, int features, Long dataUsage) { this.number = number; this.numberPresentation = numberPresentation; this.formattedNumber = formattedNumber; @@ -98,5 +108,7 @@ public class PhoneCallDetails { this.photoUri = photoUri; this.sourceType = sourceType; this.accountIcon = accountIcon; + this.features = features; + this.dataUsage = dataUsage; } } diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index 62ef30580..2a24557f1 100644 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -17,6 +17,8 @@ package com.android.dialer; import android.content.res.Resources; +import android.provider.CallLog; +import android.provider.CallLog.Calls; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.text.TextUtils; import android.text.format.DateUtils; @@ -29,6 +31,7 @@ import com.android.dialer.calllog.CallTypeHelper; import com.android.dialer.calllog.ContactInfo; import com.android.dialer.calllog.PhoneNumberDisplayHelper; import com.android.dialer.calllog.PhoneNumberUtilsWrapper; +import com.android.dialer.util.DialerUtils; import com.google.common.collect.Lists; @@ -77,6 +80,10 @@ public class PhoneCallDetailsHelper { for (int index = 0; index < count && index < MAX_CALL_TYPE_ICONS; ++index) { views.callTypeIcons.add(details.callTypes[index]); } + + // Show the video icon if the call had video enabled. + views.callTypeIcons.setShowVideo( + (details.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO); views.callTypeIcons.requestLayout(); views.callTypeIcons.setVisibility(View.VISIBLE); @@ -142,7 +149,7 @@ public class PhoneCallDetailsHelper { mDescriptionItems.add(getCallDate(details)); // Create a comma separated list from the call type or location, and call date. - return TextUtils.join(", " , mDescriptionItems); + return DialerUtils.join(mResources, mDescriptionItems); } /** diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java index 67cadb135..cc116e7ad 100644 --- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java +++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java @@ -19,6 +19,7 @@ package com.android.dialer.calllog; import android.content.Context; import android.provider.CallLog.Calls; import android.text.format.DateUtils; +import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,6 +28,10 @@ import android.widget.TextView; import com.android.dialer.PhoneCallDetails; import com.android.dialer.R; +import com.android.dialer.util.DialerUtils; +import com.google.common.collect.Lists; + +import java.util.ArrayList; /** * Adapter for a ListView containing history items from the details of a call. @@ -42,6 +47,11 @@ public class CallDetailHistoryAdapter extends BaseAdapter { private final CallTypeHelper mCallTypeHelper; private final PhoneCallDetails[] mPhoneCallDetails; + /** + * List of items to be concatenated together for duration strings. + */ + private ArrayList<CharSequence> mDurationItems = Lists.newArrayList(); + public CallDetailHistoryAdapter(Context context, LayoutInflater layoutInflater, CallTypeHelper callTypeHelper, PhoneCallDetails[] phoneCallDetails) { mContext = context; @@ -114,6 +124,8 @@ public class CallDetailHistoryAdapter extends BaseAdapter { int callType = details.callTypes[0]; callTypeIconView.clear(); callTypeIconView.add(callType); + callTypeIconView.setShowVideo( + (details.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO); callTypeTextView.setText(mCallTypeHelper.getCallTypeText(callType)); // Set the date. CharSequence dateValue = DateUtils.formatDateRange(mContext, details.date, details.date, @@ -125,13 +137,13 @@ public class CallDetailHistoryAdapter extends BaseAdapter { durationView.setVisibility(View.GONE); } else { durationView.setVisibility(View.VISIBLE); - durationView.setText(formatDuration(details.duration)); + durationView.setText(formatDurationAndDataUsage(details.duration, details.dataUsage)); } return result; } - private String formatDuration(long elapsedSeconds) { + private CharSequence formatDuration(long elapsedSeconds) { long minutes = 0; long seconds = 0; @@ -143,4 +155,25 @@ public class CallDetailHistoryAdapter extends BaseAdapter { return mContext.getString(R.string.callDetailsDurationFormat, minutes, seconds); } + + /** + * Formats a string containing the call duration and the data usage (if specified). + * + * @param elapsedSeconds Total elapsed seconds. + * @param dataUsage Data usage in bytes, or null if not specified. + * @return String containing call duration and data usage. + */ + private CharSequence formatDurationAndDataUsage(long elapsedSeconds, Long dataUsage) { + CharSequence duration = formatDuration(elapsedSeconds); + + if (dataUsage != null) { + mDurationItems.clear(); + mDurationItems.add(duration); + mDurationItems.add(Formatter.formatShortFileSize(mContext, dataUsage)); + + return DialerUtils.join(mContext.getResources(), mDurationItems); + } else { + return duration; + } + } } diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 483c5020a..2987c9e4e 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -742,17 +742,23 @@ public class CallLogAdapter extends GroupingListAdapter final int[] callTypes = getCallTypes(c, count); final String geocode = c.getString(CallLogQuery.GEOCODED_LOCATION); final int sourceType = info.sourceType; + final int features = getCallFeatures(c, count); + Long dataUsage = null; + if (!c.isNull(CallLogQuery.DATA_USAGE)) { + dataUsage = c.getLong(CallLogQuery.DATA_USAGE); + } + final PhoneCallDetails details; if (TextUtils.isEmpty(name)) { details = new PhoneCallDetails(number, numberPresentation, formattedNumber, countryIso, geocode, callTypes, date, - duration, accountIcon); + duration, accountIcon, features, dataUsage); } else { details = new PhoneCallDetails(number, numberPresentation, formattedNumber, countryIso, geocode, callTypes, date, duration, name, ntype, label, lookupUri, photoUri, sourceType, - accountIcon); + accountIcon, features, dataUsage); } mCallLogViewsHelper.setPhoneCallDetails(views, details); @@ -1182,6 +1188,25 @@ public class CallLogAdapter extends GroupingListAdapter return callTypes; } + /** + * Determine the features which were enabled for any of the calls that make up a call log + * entry. + * + * @param cursor The cursor. + * @param count The number of calls for the current call log entry. + * @return The features. + */ + private int getCallFeatures(Cursor cursor, int count) { + int features = Calls.FEATURES_NONE; + int position = cursor.getPosition(); + for (int index = 0; index < count; ++index) { + features |= cursor.getInt(CallLogQuery.FEATURES); + cursor.moveToNext(); + } + cursor.moveToPosition(position); + return features; + } + private PhoneAccount getAccount(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/CallLogQuery.java b/src/com/android/dialer/calllog/CallLogQuery.java index 8b88818a8..904ce7473 100644 --- a/src/com/android/dialer/calllog/CallLogQuery.java +++ b/src/com/android/dialer/calllog/CallLogQuery.java @@ -46,6 +46,8 @@ public final class CallLogQuery { Calls.NUMBER_PRESENTATION, // 17 Calls.PHONE_ACCOUNT_COMPONENT_NAME, // 18 Calls.PHONE_ACCOUNT_ID, // 19 + Calls.FEATURES, // 20 + Calls.DATA_USAGE // 21 }; public static final int ID = 0; @@ -68,4 +70,6 @@ public final class CallLogQuery { public static final int NUMBER_PRESENTATION = 17; public static final int ACCOUNT_COMPONENT_NAME = 18; public static final int ACCOUNT_ID = 19; + public static final int FEATURES = 20; + public static final int DATA_USAGE = 21; } diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java index afbced41c..382056c72 100644 --- a/src/com/android/dialer/calllog/CallTypeIconsView.java +++ b/src/com/android/dialer/calllog/CallTypeIconsView.java @@ -17,8 +17,11 @@ package com.android.dialer.calllog; import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.PorterDuff; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.provider.CallLog.Calls; import android.util.AttributeSet; @@ -38,6 +41,7 @@ import java.util.List; */ public class CallTypeIconsView extends View { private List<Integer> mCallTypes = Lists.newArrayListWithCapacity(3); + private boolean mShowVideo = false; private Resources mResources; private int mWidth; private int mHeight; @@ -67,6 +71,20 @@ public class CallTypeIconsView extends View { invalidate(); } + /** + * Determines whether the video call icon will be shown. + * + * @param showVideo True where the video icon should be shown. + */ + public void setShowVideo(boolean showVideo) { + mShowVideo = showVideo; + if (showVideo) { + mWidth += mResources.videoCall.getIntrinsicWidth(); + mHeight = Math.max(mHeight, mResources.videoCall.getIntrinsicHeight()); + invalidate(); + } + } + @NeededForTesting public int getCount() { return mCallTypes.size(); @@ -111,6 +129,14 @@ public class CallTypeIconsView extends View { drawable.draw(canvas); left = right + mResources.iconMargin; } + + // If showing the video call icon, draw it scaled appropriately. + if (mShowVideo) { + final Drawable drawable = mResources.videoCall; + final int right = left + mResources.videoCall.getIntrinsicWidth(); + drawable.setBounds(left, 0, right, mResources.videoCall.getIntrinsicHeight()); + drawable.draw(canvas); + } } private static class Resources { @@ -136,6 +162,11 @@ public class CallTypeIconsView extends View { public final Drawable voicemail; /** + * Drawable repesenting a video call. + */ + public final Drawable videoCall; + + /** * The margin to use for icons. */ public final int iconMargin; @@ -163,6 +194,21 @@ public class CallTypeIconsView extends View { missed.setColorFilter(r.getColor(R.color.missed_call), PorterDuff.Mode.MULTIPLY); voicemail = r.getDrawable(R.drawable.ic_call_voicemail_holo_dark); + + // Get the video call icon, scaled to match the height of the call arrows. + // We want the video call icon to be the same height as the call arrows, while keeping + // the same width aspect ratio. + Bitmap videoIcon = BitmapFactory.decodeResource(context.getResources(), + R.drawable.ic_videocam_wht_24dp); + int scaledHeight = missed.getIntrinsicHeight(); + int scaledWidth = (int) ((float) videoIcon.getWidth() * + ((float) missed.getIntrinsicHeight() / + (float) videoIcon.getHeight())); + Bitmap scaled = Bitmap.createScaledBitmap(videoIcon, scaledWidth, scaledHeight, false); + videoCall = new BitmapDrawable(context.getResources(), scaled); + videoCall.setColorFilter(r.getColor(R.color.dialtacts_secondary_text_color), + PorterDuff.Mode.MULTIPLY); + iconMargin = r.getDimensionPixelSize(R.dimen.call_log_icon_margin); } } diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java index 484e97d92..2b4a74ccc 100644 --- a/src/com/android/dialer/util/DialerUtils.java +++ b/src/com/android/dialer/util/DialerUtils.java @@ -24,6 +24,7 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.net.Uri; import android.provider.Telephony; +import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -124,4 +125,17 @@ public class DialerUtils { } } } + + /** + * Joins a list of {@link CharSequence} into a single {@link CharSequence} seperated by a + * localized delimiter such as ", ". + * + * @param resources Resources used to get list delimiter. + * @param list List of char sequences to join. + * @return Joined char sequences. + */ + public static CharSequence join(Resources resources, Iterable<CharSequence> list) { + final CharSequence separator = resources.getString(R.string.list_delimeter); + return TextUtils.join(separator, list); + } } diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml index 7651b0827..2359f2cde 100644 --- a/tests/res/layout/fill_call_log_test.xml +++ b/tests/res/layout/fill_call_log_test.xml @@ -58,26 +58,43 @@ android:layout_height="wrap_content" android:text="@string/add_custom_entry" /> - <RadioGroup + <LinearLayout + android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - <RadioButton - android:id="@+id/call_type_incoming" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/call_type_incoming" /> - <RadioButton - android:id="@+id/call_type_missed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/call_type_missed" /> - <RadioButton - android:id="@+id/call_type_outgoing" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/call_type_outgoing" /> - </RadioGroup> + android:gravity="left" + > + <RadioGroup + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <RadioButton + android:id="@+id/call_type_incoming" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/call_type_incoming" + android:textSize="9sp" /> + <RadioButton + android:id="@+id/call_type_missed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/call_type_missed" + android:textSize="9sp" /> + <RadioButton + android:id="@+id/call_type_outgoing" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/call_type_outgoing" + android:textSize="9sp" /> + </RadioGroup> + <CheckBox + android:id="@+id/call_type_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/call_type_video" + android:textSize="9sp" + /> + </LinearLayout> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" diff --git a/tests/res/values/donottranslate_strings.xml b/tests/res/values/donottranslate_strings.xml index 553b3c0a6..d4b48a6cd 100644 --- a/tests/res/values/donottranslate_strings.xml +++ b/tests/res/values/donottranslate_strings.xml @@ -41,6 +41,7 @@ <string name="call_type_incoming">Incoming</string> <string name="call_type_missed">Missed</string> <string name="call_type_outgoing">Outgoing</string> + <string name="call_type_video">Video</string> <string name="call_date">Call date</string> <string name="call_time">Call time</string> <string name="edit">Edit</string> diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java index ae4759668..147201bcb 100644 --- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java +++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java @@ -290,7 +290,8 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { mHelper.setPhoneCallDetails(mViews, new PhoneCallDetails(number, presentation, formattedNumber, TEST_COUNTRY_ISO, TEST_GEOCODE, - new int[]{ Calls.VOICEMAIL_TYPE }, TEST_DATE, TEST_DURATION, null) + new int[]{ Calls.VOICEMAIL_TYPE }, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null) ); } @@ -300,7 +301,8 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { mHelper.setPhoneCallDetails(mViews, new PhoneCallDetails(number, Calls.PRESENTATION_ALLOWED, formattedNumber, TEST_COUNTRY_ISO, geocodedLocation, - new int[]{ Calls.VOICEMAIL_TYPE }, TEST_DATE, TEST_DURATION, null) + new int[]{ Calls.VOICEMAIL_TYPE }, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null) ); } @@ -309,7 +311,8 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { mHelper.setPhoneCallDetails(mViews, new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED, TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE, - new int[]{ Calls.INCOMING_TYPE }, date, TEST_DURATION, null) + new int[]{ Calls.INCOMING_TYPE }, date, TEST_DURATION, null, + Calls.FEATURES_NONE, null) ); } @@ -318,7 +321,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, null) + callTypes, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, null) ); } @@ -326,7 +329,8 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { mHelper.setCallDetailsHeader(mNameView, new PhoneCallDetails(number, presentation, TEST_FORMATTED_NUMBER, TEST_COUNTRY_ISO, TEST_GEOCODE, - new int[]{ Calls.INCOMING_TYPE }, TEST_DATE, TEST_DURATION, null)); + new int[]{ Calls.INCOMING_TYPE }, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null)); } private void setCallDetailsHeader(String name) { @@ -334,6 +338,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, null)); + name, 0, "", null, null, 0, null, Calls.FEATURES_NONE, null)); } } diff --git a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java index ae76157f3..8fbda1596 100644 --- a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java @@ -128,7 +128,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, null); + new int[]{Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, + null); assertEquals(R.string.description_incoming_answered_call, mHelper.getCallDescriptionStringID(details)); } @@ -140,7 +141,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, null); + new int[]{Calls.MISSED_TYPE}, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, + null); assertEquals(R.string.description_incoming_missed_call, mHelper.getCallDescriptionStringID(details)); } @@ -152,7 +154,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, null); + new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null); assertEquals(R.string.description_incoming_missed_call, mHelper.getCallDescriptionStringID(details)); } @@ -165,7 +168,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, null); + new int[]{Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, + null); assertEquals(R.string.description_incoming_answered_call, mHelper.getCallDescriptionStringID(details)); } @@ -178,7 +182,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, null); + new int[]{Calls.MISSED_TYPE}, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, + null); assertEquals(R.string.description_incoming_missed_call, mHelper.getCallDescriptionStringID(details)); } @@ -191,7 +196,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, null); + new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null); assertEquals(R.string.description_incoming_missed_call, mHelper.getCallDescriptionStringID(details)); } @@ -205,7 +211,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, null); + new int[]{Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, + null); assertEquals(R.string.description_outgoing_call, mHelper.getCallDescriptionStringID(details)); } @@ -219,7 +226,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, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION, null); + new int[]{Calls.OUTGOING_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null); assertEquals(R.string.description_outgoing_call, mHelper.getCallDescriptionStringID(details)); } @@ -233,7 +241,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, - null); + null, Calls.FEATURES_NONE, null); CharSequence description = mHelper.getCallDescription(details); assertFalse(description.toString() .contains(this.mResources.getString(R.string.description_new_voicemail))); @@ -248,7 +256,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, - null); + null, Calls.FEATURES_NONE, null); CharSequence description = mHelper.getCallDescription(details); assertFalse(description.toString() .contains(this.mResources.getString(R.string.description_new_voicemail))); @@ -262,7 +270,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, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION, null); + new int[]{Calls.MISSED_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null); CharSequence description = mHelper.getCallDescription(details); assertFalse(description.toString() .contains(this.mResources.getString(R.string.description_new_voicemail))); @@ -277,7 +286,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, - null); + null, Calls.FEATURES_NONE, null); CharSequence description = mHelper.getCallDescription(details); assertTrue(description.toString() .contains(this.mResources.getString(R.string.description_new_voicemail))); @@ -291,7 +300,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, null); + new int[]{Calls.VOICEMAIL_TYPE}, TEST_DATE, TEST_DURATION, null, + Calls.FEATURES_NONE, null); CharSequence description = mHelper.getCallDescription(details); // Rather than hard coding the "X calls" string message, we'll generate it with an empty @@ -311,7 +321,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, - null); + null, Calls.FEATURES_NONE, null); CharSequence description = mHelper.getCallDescription(details); assertTrue(description.toString() .contains(this.mResources.getString(R.string.description_num_calls, 2))); @@ -337,7 +347,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, null) + new int[]{ callType }, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, + null) ); } @@ -346,7 +357,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, null) + types, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, null) ); } @@ -355,7 +366,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, null) + types, TEST_DATE, TEST_DURATION, null, Calls.FEATURES_NONE, null) ); } } diff --git a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java index e495ca742..ea3485338 100644 --- a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java +++ b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java @@ -72,6 +72,7 @@ public class FillCallLogTestActivity extends Activity { private RadioButton mCallTypeIncoming; private RadioButton mCallTypeMissed; private RadioButton mCallTypeOutgoing; + private CheckBox mCallTypeVideo; private RadioButton mPresentationAllowed; private RadioButton mPresentationRestricted; private RadioButton mPresentationUnknown; @@ -124,6 +125,7 @@ public class FillCallLogTestActivity extends Activity { mCallTypeIncoming = (RadioButton) findViewById(R.id.call_type_incoming); mCallTypeMissed = (RadioButton) findViewById(R.id.call_type_missed); mCallTypeOutgoing = (RadioButton) findViewById(R.id.call_type_outgoing); + mCallTypeVideo = (CheckBox) findViewById(R.id.call_type_video); mPresentationAllowed = (RadioButton) findViewById(R.id.presentation_allowed); mPresentationPayphone = (RadioButton) findViewById(R.id.presentation_payphone); mPresentationUnknown = (RadioButton) findViewById(R.id.presentation_unknown); @@ -488,9 +490,16 @@ public class FillCallLogTestActivity extends Activity { Calendar dateTime = Calendar.getInstance(); dateTime.set(mCallDateYear, mCallDateMonth, mCallDateDay, mCallTimeHour, mCallTimeMinute); + int features = mCallTypeVideo.isChecked() ? Calls.FEATURES_VIDEO : Calls.FEATURES_NONE; + Long dataUsage = null; + if (mCallTypeVideo.isChecked()) { + // Some random data usage up to 50MB. + dataUsage = (long) RNG.nextInt(52428800); + } + Calls.addCall(null, this, mPhoneNumber.getText().toString(), getManualPresentation(), - getManualCallType(), getManualAccount(), dateTime.getTimeInMillis(), - RNG.nextInt(60 * 60)); + getManualCallType(), features, getManualAccount(), + dateTime.getTimeInMillis(), RNG.nextInt(60 * 60), dataUsage); // Subtract offset from the call date/time and store as new date/time int offset = Integer.parseInt(mOffset.getText().toString()); diff --git a/tests/src/com/android/dialer/util/DialerUtilsTest.java b/tests/src/com/android/dialer/util/DialerUtilsTest.java new file mode 100644 index 000000000..fdd02c10c --- /dev/null +++ b/tests/src/com/android/dialer/util/DialerUtilsTest.java @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.dialer.util; + +import com.android.dialer.PhoneCallDetailsHelper; +import com.google.common.collect.Lists; + +import android.content.Context; +import android.content.res.Resources; +import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; + +import java.util.ArrayList; + +/** + * Performs tests of the DialerUtils class. + */ +@SmallTest +public class DialerUtilsTest extends AndroidTestCase { + + private Resources mResources; + + /** + * List of items to be concatenated together for CharSequence join tests. + */ + private ArrayList<CharSequence> mItems = Lists.newArrayList(); + + @Override + protected void setUp() throws Exception { + super.setUp(); + Context context = getContext(); + mResources = context.getResources(); + } + + /** + * Tests joining an empty list of {@link CharSequence}. + */ + public void testJoinEmpty() { + mItems.clear(); + CharSequence joined = DialerUtils.join(mResources, mItems); + assertEquals("", joined); + } + + /** + * Tests joining a list of {@link CharSequence} with a single entry. + */ + public void testJoinOne() { + mItems.clear(); + mItems.add("Hello"); + CharSequence joined = DialerUtils.join(mResources, mItems); + assertEquals("Hello", joined); + } + + /** + * Tests joining a list of {@link CharSequence} with a multiple entries. + */ + public void testJoinTwo() { + mItems.clear(); + mItems.add("Hello"); + mItems.add("there"); + CharSequence joined = DialerUtils.join(mResources, mItems); + assertEquals("Hello, there", joined); + } +} |
