Fix the ContactsTest account type and sync adapter (1/2)
* Add TestSyncService$Basic to the AndroidManifest and give
it the fallback account type unit test contacts.xml.
* Remove "common" from the testauth package name
* Change the test accountType to end with testauth.basic
instead of authtest.basic since it's testauth
everywhere else.
* UI changes
- Give the test account type the same name as the app
- Remove the ic_contact_picture test account type icon
since it just looks like a black square and we can
just use the default (after we add a guard against
null icons in the DrawerActivity)
Test: manually add a user of the test account type and
toggle sync, then add a contact of the test account
type in the app.
Bug: 30759296
Bug: 31549157
Change-Id: I363fff8dfbce3d2d1b888e23abe6e20a40da2d1c
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 09281ee..729d75f 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -497,9 +497,11 @@
return true;
}
});
- menuItem.setIcon(displayableAccount.getIcon());
- // Get rid of the default menu item overlay and show original account icons.
- menuItem.getIcon().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_ATOP);
+ if (displayableAccount.getIcon() != null) {
+ menuItem.setIcon(displayableAccount.getIcon());
+ // Get rid of the default menu item overlay and show original account icons.
+ menuItem.getIcon().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_ATOP);
+ }
// Create a dummy action view to attach extra hidden content description to the menuItem
// for Talkback. We want Talkback to read out the account type but not have it be part
// of the menuItem title.