Call History Affordances Swap
1. Swapped the intents for the primary view
2. Changed the icon for the secondary action button
3. Added a vertical divider line to separate the secondary action button from the primary view
4. Cleaned up the accessibility text
Bug: 12800272
Change-Id: Ifd4ceff0d67b1587c4378e29be7344de50057a7d
(cherry picked from commit 45ed3b5932ed590b45235d7b2befa736a95e7f75)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 3a714e3..94aa3aa 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -25,6 +25,7 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
+ <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_SYNC_STATS" />
diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
index 4ccdaaf..49d32e5 100644
--- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java
@@ -117,7 +117,7 @@
FragmentManager fragmentManager = mActivity.getFragmentManager();
FragmentTransaction transaction = fragmentManager.beginTransaction();
transaction.add(FragmentTestActivity.LAYOUT_ID, mFragment);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
// Wait for the fragment to be loaded.
getInstrumentation().waitForIdleSync();
@@ -320,7 +320,12 @@
mAdapter.bindStandAloneView(view, getActivity(), mCursor);
CallLogListItemViews views = (CallLogListItemViews) view.getTag();
- IntentProvider intentProvider = (IntentProvider) views.secondaryActionView.getTag();
+
+ // The primaryActionView tag is set in the
+ // {@link com.android.dialer.calllog.CallLogAdapter#bindView} method. If it is possible
+ // to place a call to the phone number, a call intent will have been created for the
+ // primaryActionView.
+ IntentProvider intentProvider = (IntentProvider) views.primaryActionView.getTag();
Intent intent = intentProvider.getIntent(mActivity);
// Starts a call.
assertEquals(Intent.ACTION_CALL_PRIVILEGED, intent.getAction());
@@ -336,7 +341,7 @@
mAdapter.bindStandAloneView(view, getActivity(), mCursor);
CallLogListItemViews views = (CallLogListItemViews) view.getTag();
- IntentProvider intentProvider = (IntentProvider) views.secondaryActionView.getTag();
+ IntentProvider intentProvider = (IntentProvider) views.secondaryActionButtonView.getTag();
Intent intent = intentProvider.getIntent(mActivity);
// Starts the call detail activity.
assertEquals(new ComponentName(mActivity, CallDetailActivity.class),
@@ -362,8 +367,9 @@
// HELPERS to check conditions on the DB/views
//
/**
- * Go over all the views in the list and check that the Call
- * icon's visibility matches the nature of the number.
+ * Go over the views in the list and check to ensure that
+ * callable numbers have an associated call intent, where numbers
+ * which are not callable have a null intent.
*/
private void checkCallStatus() {
for (int i = 0; i < mList.length; i++) {
@@ -374,9 +380,17 @@
int presentation = getPhoneNumberPresentationForListEntry(i);
if (presentation == Calls.PRESENTATION_RESTRICTED ||
presentation == Calls.PRESENTATION_UNKNOWN) {
- assertFalse(View.VISIBLE == mItem.secondaryActionView.getVisibility());
+ //If number is not callable, the primary action view should have a null tag.
+ assertNull(mItem.primaryActionView.getTag());
} else {
- assertEquals(View.VISIBLE, mItem.secondaryActionView.getVisibility());
+ //If the number is callable, the primary action view should have a non-null tag.
+ assertNotNull(mItem.primaryActionView.getTag());
+
+ IntentProvider intentProvider = (IntentProvider)mItem.primaryActionView.getTag();
+ Intent callIntent = intentProvider.getIntent(mActivity);
+
+ //The intent should be to make the call
+ assertEquals(Intent.ACTION_CALL_PRIVILEGED, callIntent.getAction());
}
}
}
diff --git a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
index a10dec9..7e4736e 100644
--- a/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogListItemHelperTest.java
@@ -24,6 +24,7 @@
import com.android.dialer.PhoneCallDetails;
import com.android.dialer.PhoneCallDetailsHelper;
+import com.android.dialer.R;
/**
* Unit tests for {@link CallLogListItemHelper}.
@@ -52,19 +53,21 @@
private PhoneNumberDisplayHelper mPhoneNumberHelper;
private PhoneNumberDisplayHelper mPhoneNumberDisplayHelper;
+ private Resources mResources;
+
@Override
protected void setUp() throws Exception {
super.setUp();
Context context = getContext();
- Resources resources = context.getResources();
- CallTypeHelper callTypeHelper = new CallTypeHelper(resources);
+ mResources = context.getResources();
+ CallTypeHelper callTypeHelper = new CallTypeHelper(mResources);
final TestPhoneNumberUtilsWrapper phoneUtils = new TestPhoneNumberUtilsWrapper(
TEST_VOICEMAIL_NUMBER);
PhoneCallDetailsHelper phoneCallDetailsHelper = new PhoneCallDetailsHelper(
- resources, callTypeHelper, phoneUtils);
- mPhoneNumberDisplayHelper = new PhoneNumberDisplayHelper(resources);
+ mResources, callTypeHelper, phoneUtils);
+ mPhoneNumberDisplayHelper = new PhoneNumberDisplayHelper(mResources);
mHelper = new CallLogListItemHelper(phoneCallDetailsHelper, mPhoneNumberDisplayHelper,
- resources);
+ mResources);
mViews = CallLogListItemViews.createForTest(context);
}
@@ -78,92 +81,286 @@
public void testSetPhoneCallDetails() {
setPhoneCallDetailsWithNumber("12125551234", Calls.PRESENTATION_ALLOWED,
"1-212-555-1234");
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
public void testSetPhoneCallDetailsInFavorites() {
setPhoneCallDetailsWithNumberInFavorites("12125551234", Calls.PRESENTATION_ALLOWED,
"1-212-555-1234");
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetails_Unknown() {
setPhoneCallDetailsWithNumber("", Calls.PRESENTATION_UNKNOWN, "");
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetailsInFavorites_Unknown() {
setPhoneCallDetailsWithNumberInFavorites("", Calls.PRESENTATION_UNKNOWN, "");
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetails_Private() {
setPhoneCallDetailsWithNumber("", Calls.PRESENTATION_RESTRICTED, "");
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetailsInFavorites_Private() {
setPhoneCallDetailsWithNumberInFavorites("", Calls.PRESENTATION_RESTRICTED, "");
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetails_Payphone() {
setPhoneCallDetailsWithNumber("", Calls.PRESENTATION_PAYPHONE, "");
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetailsInFavorites_Payphone() {
setPhoneCallDetailsWithNumberInFavorites("", Calls.PRESENTATION_PAYPHONE, "");
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetails_VoicemailNumber() {
setPhoneCallDetailsWithNumber(TEST_VOICEMAIL_NUMBER,
Calls.PRESENTATION_ALLOWED, TEST_VOICEMAIL_NUMBER);
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
public void testSetPhoneCallDetails_ReadVoicemail() {
setPhoneCallDetailsWithTypes(Calls.VOICEMAIL_TYPE);
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
public void testSetPhoneCallDetails_UnreadVoicemail() {
setUnreadPhoneCallDetailsWithTypes(Calls.VOICEMAIL_TYPE);
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
public void testSetPhoneCallDetails_VoicemailFromUnknown() {
setPhoneCallDetailsWithNumberAndType("", Calls.PRESENTATION_UNKNOWN,
"", Calls.VOICEMAIL_TYPE);
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
public void testSetPhoneCallDetailsInFavorites_VoicemailNumber() {
setPhoneCallDetailsWithNumberInFavorites(TEST_VOICEMAIL_NUMBER,
Calls.PRESENTATION_ALLOWED, TEST_VOICEMAIL_NUMBER);
- assertNoCallButton();
+ assertNoCallIntent();
}
public void testSetPhoneCallDetailsInFavorites_ReadVoicemail() {
setPhoneCallDetailsWithTypesInFavorites(Calls.VOICEMAIL_TYPE);
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
public void testSetPhoneCallDetailsInFavorites_UnreadVoicemail() {
setUnreadPhoneCallDetailsWithTypesInFavorites(Calls.VOICEMAIL_TYPE);
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
public void testSetPhoneCallDetailsInFavorites_VoicemailFromUnknown() {
setPhoneCallDetailsWithNumberAndTypeInFavorites("", Calls.PRESENTATION_UNKNOWN,
"", Calls.VOICEMAIL_TYPE);
- assertEquals(View.VISIBLE, mViews.secondaryActionView.getVisibility());
+ assertEquals(View.VISIBLE, mViews.secondaryActionButtonView.getVisibility());
}
- /** Asserts that the whole call area is gone. */
- private void assertNoCallButton() {
- assertEquals(View.GONE, mViews.secondaryActionView.getVisibility());
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where an answered unknown call is received.
+ */
+ 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);
+ assertEquals(R.string.description_unknown_answered_call,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where an missed unknown call is received.
+ */
+ 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);
+ assertEquals(R.string.description_unknown_missed_call,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where an missed unknown call is received and a voicemail was left.
+ */
+ 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);
+ assertEquals(R.string.description_unknown_missed_call,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where an answered call from a known caller is received.
+ */
+ public void testGetCallDescriptionID_KnownAnswered() {
+ 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);
+ assertEquals(R.string.description_return_answered_call,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where a missed call from a known caller is received.
+ */
+ public void testGetCallDescriptionID_KnownMissed() {
+ 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);
+ assertEquals(R.string.description_return_missed_call,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where a missed call from a known caller is received and a voicemail was left.
+ */
+ public void testGetCallDescriptionID_KnownVoicemail() {
+ 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);
+ assertEquals(R.string.description_return_missed_call,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where an outgoing call is made to a known number and there is a history of
+ * only a single call for this caller.
+ */
+ public void testGetCallDescriptionID_OutgoingSingle() {
+ 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);
+ assertEquals(R.string.description_call_last,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescriptionID method used to get the accessibility description for calls.
+ * Test case where an outgoing call is made to a known number and there is a history of
+ * many calls for this caller.
+ */
+ public void testGetCallDescriptionID_OutgoingMultiple() {
+ 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);
+ assertEquals(R.string.description_call_last_multiple,
+ mHelper.getCallDescriptionStringID(details));
+ }
+
+ /**
+ * Test getCallDescription method used to get the accessibility description for calls.
+ * For outgoing calls, we should NOT have "New Voicemail" in the description.
+ */
+ public void testGetCallDescription_NoVoicemailOutgoing() {
+ 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);
+ CharSequence description = mHelper.getCallDescription(details);
+ assertFalse(description.toString()
+ .contains(this.mResources.getString(R.string.description_new_voicemail)));
+ }
+
+ /**
+ * Test getCallDescription method used to get the accessibility description for calls.
+ * For regular incoming calls, we should NOT have "New Voicemail" in the description.
+ */
+ public void testGetCallDescription_NoVoicemailIncoming() {
+ PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
+ TEST_FORMATTED_NUMBER,
+ TEST_COUNTRY_ISO, TEST_GEOCODE,
+ new int[]{Calls.INCOMING_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION);
+ CharSequence description = mHelper.getCallDescription(details);
+ assertFalse(description.toString()
+ .contains(this.mResources.getString(R.string.description_new_voicemail)));
+ }
+
+ /**
+ * Test getCallDescription method used to get the accessibility description for calls.
+ * For regular missed calls, we should NOT have "New Voicemail" in the description.
+ */
+ public void testGetCallDescription_NoVoicemailMissed() {
+ 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);
+ CharSequence description = mHelper.getCallDescription(details);
+ assertFalse(description.toString()
+ .contains(this.mResources.getString(R.string.description_new_voicemail)));
+ }
+
+ /**
+ * Test getCallDescription method used to get the accessibility description for calls.
+ * For voicemail calls, we should have "New Voicemail" in the description.
+ */
+ public void testGetCallDescription_Voicemail() {
+ PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
+ TEST_FORMATTED_NUMBER,
+ TEST_COUNTRY_ISO, TEST_GEOCODE,
+ new int[]{Calls.VOICEMAIL_TYPE, Calls.OUTGOING_TYPE}, TEST_DATE, TEST_DURATION);
+ CharSequence description = mHelper.getCallDescription(details);
+ assertTrue(description.toString()
+ .contains(this.mResources.getString(R.string.description_new_voicemail)));
+ }
+
+ /**
+ * Test getCallDescription method used to get the accessibility description for calls.
+ * Test that the "X calls" message is not present if there is only a single call.
+ */
+ public void testGetCallDescription_NumCallsSingle() {
+ 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);
+ CharSequence description = mHelper.getCallDescription(details);
+
+ // Rather than hard coding the "X calls" string message, we'll generate it with an empty
+ // number of calls, and trim the resulting string. This gets us just the word "calls",
+ // and ensures any trivial changes to that string resource won't unnecessarily break
+ // the unit test.
+ assertFalse(description.toString()
+ .contains(this.mResources.getString(R.string.description_num_calls, "").trim()));
+ }
+
+ /**
+ * Test getCallDescription method used to get the accessibility description for calls.
+ * Test that the "X calls" message is present if there are many calls.
+ */
+ public void testGetCallDescription_NumCallsMultiple() {
+ PhoneCallDetails details = new PhoneCallDetails(TEST_NUMBER, Calls.PRESENTATION_ALLOWED,
+ TEST_FORMATTED_NUMBER,
+ TEST_COUNTRY_ISO, TEST_GEOCODE,
+ new int[]{Calls.VOICEMAIL_TYPE, Calls.INCOMING_TYPE}, TEST_DATE, TEST_DURATION);
+ CharSequence description = mHelper.getCallDescription(details);
+ assertTrue(description.toString()
+ .contains(this.mResources.getString(R.string.description_num_calls, 2)));
+ }
+
+ /** Asserts that the primary action view does not have a call intent. */
+ private void assertNoCallIntent() {
+ Object intentProvider = (IntentProvider)mViews.primaryActionView.getTag();
+ // The intent provider should be null as there is no ability to make a call.
+ assertNull(intentProvider);
}
/** Sets the details of a phone call using the specified phone number. */