Merge changes Ie5886646,Id14651f0 into ub-contactsdialer-h-dev
* changes:
Improve talkback usability of SIM import dialog.
Adjustments to MockContentProvider for tests.
diff --git a/res/layout/fragment_sim_import.xml b/res/layout/fragment_sim_import.xml
index 9e2f493..6b8c3fe 100644
--- a/res/layout/fragment_sim_import.xml
+++ b/res/layout/fragment_sim_import.xml
@@ -26,6 +26,7 @@
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:navigationContentDescription="@string/sim_import_cancel_content_description"
app:navigationIcon="@drawable/ic_close_dk"
app:title="@string/sim_import_title_none_selected">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d170127..2c911c9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1812,4 +1812,11 @@
<!-- Toast shown on settings screen when importing from SIM completes with an error -->
<string name="sim_import_failed_toast">Failed to import SIM contacts</string>
+ <!-- Title of SIM import dialog for accessibility; this isn't displayed but is announced
+ by talkback when the window is shown -->
+ <string name="sim_import_dialog_title">Select contacts to import</string>
+
+ <!-- Content description of the cancel navigation icon shown in SIM import dialog toolbar -->
+ <string name="sim_import_cancel_content_description">Cancel import</string>
+
</resources>
diff --git a/src/com/android/contacts/SimImportFragment.java b/src/com/android/contacts/SimImportFragment.java
index a9dcf97..7421df4 100644
--- a/src/com/android/contacts/SimImportFragment.java
+++ b/src/com/android/contacts/SimImportFragment.java
@@ -15,6 +15,7 @@
*/
package com.android.contacts;
+import android.app.Dialog;
import android.app.DialogFragment;
import android.app.LoaderManager;
import android.content.AsyncTaskLoader;
@@ -74,7 +75,7 @@
@Override
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setStyle(STYLE_NO_TITLE, R.style.PeopleThemeAppCompat_FullScreenDialog);
+ setStyle(STYLE_NORMAL, R.style.PeopleThemeAppCompat_FullScreenDialog);
mPreferences = new ContactsPreferences(getContext());
mAccountTypeManager = AccountTypeManager.getInstance(getActivity());
mAdapter = new SimContactAdapter(getActivity());
@@ -89,6 +90,15 @@
}
@Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ Dialog dialog = super.onCreateDialog(savedInstanceState);
+ // Set the title for accessibility. It isn't displayed but will get announced when the
+ // window is shown
+ dialog.setTitle(R.string.sim_import_dialog_title);
+ return dialog;
+ }
+
+ @Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
getLoaderManager().initLoader(0, null, this);
@@ -248,6 +258,11 @@
ContactListItemView contactView = (ContactListItemView) itemView;
bindNameAndViewId(contactView, cursor);
bindPhoto(contactView, partition, cursor);
+
+ // For accessibility. Tapping the item checks this so we don't need it to be separately
+ // clickable
+ contactView.getCheckBox().setFocusable(false);
+ contactView.getCheckBox().setClickable(false);
}
public void setContacts(ArrayList<SimContact> contacts) {
diff --git a/src/com/android/contacts/common/preference/ContactsPreferences.java b/src/com/android/contacts/common/preference/ContactsPreferences.java
index 1ae2b9d..26073f4 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/common/preference/ContactsPreferences.java
@@ -413,4 +413,5 @@
}
}
}
+
}
diff --git a/tests/src/com/android/contacts/RunMethodInstrumentation.java b/tests/src/com/android/contacts/RunMethodInstrumentation.java
index 77f36ed..11516b8 100644
--- a/tests/src/com/android/contacts/RunMethodInstrumentation.java
+++ b/tests/src/com/android/contacts/RunMethodInstrumentation.java
@@ -60,6 +60,7 @@
start();
}
+ @Override
public void onStart() {
Log.d(TAG, "onStart");
super.onStart();
diff --git a/tests/src/com/android/contacts/common/database/SimContactDaoTests.java b/tests/src/com/android/contacts/common/database/SimContactDaoTests.java
index 5b25eb2..513f551 100644
--- a/tests/src/com/android/contacts/common/database/SimContactDaoTests.java
+++ b/tests/src/com/android/contacts/common/database/SimContactDaoTests.java
@@ -26,6 +26,7 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.Suppress;
import android.support.test.runner.AndroidJUnit4;
import com.android.contacts.common.model.SimContact;
@@ -49,8 +50,6 @@
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertThat;
-import android.support.test.filters.Suppress;
-
@RunWith(Enclosed.class)
public class SimContactDaoTests {
diff --git a/tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java b/tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java
index 336467d..d3950fc 100644
--- a/tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java
+++ b/tests/src/com/android/contacts/common/test/mocks/MockContentProvider.java
@@ -165,7 +165,7 @@
public Cursor getResult(String[] projection) {
String[] columnNames;
if (mAnyProjection) {
- columnNames = projection;
+ columnNames = projection != null ? projection : mDefaultProjection;
} else {
columnNames = mProjection != null ? mProjection : mDefaultProjection;
}
@@ -176,9 +176,9 @@
cursor.addRow((Object[]) row);
} else {
ContentValues values = (ContentValues) row;
- Object[] columns = new Object[projection.length];
- for (int i = 0; i < projection.length; i++) {
- columns[i] = values.get(projection[i]);
+ Object[] columns = new Object[columnNames.length];
+ for (int i = 0; i < columnNames.length; i++) {
+ columns[i] = values.get(columnNames[i]);
}
cursor.addRow(columns);
}
@@ -485,6 +485,10 @@
return expect(new Query(contentUri));
}
+ public Query expectQuery(String contentUri) {
+ return expectQuery(Uri.parse(contentUri));
+ }
+
public void expectTypeQuery(Uri uri, String type) {
mExpectedTypeQueries.put(uri, type);
}
diff --git a/tests/src/com/android/contacts/tests/AccountsTestHelper.java b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
index 11476b3..c25c3b4 100644
--- a/tests/src/com/android/contacts/tests/AccountsTestHelper.java
+++ b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
@@ -28,6 +28,7 @@
import android.util.Log;
import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.common.preference.ContactsPreferences;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
@@ -38,8 +39,6 @@
public static final String TEST_ACCOUNT_TYPE = "com.android.contacts.tests.testauth.basic";
- public static final String EXTRA_ACCOUNT_NAME = "accountName";
-
private final Context mContext;
private final AccountManager mAccountManager;
private final ContentResolver mResolver;
@@ -117,9 +116,9 @@
* -w com.google.android.contacts.tests/com.android.contacts.RunMethodInstrumentation
*/
public static void addTestAccount(Context context, Bundle args) {
- final String accountName = args.getString(EXTRA_ACCOUNT_NAME);
+ final String accountName = args.getString("name");
if (accountName == null) {
- Log.e(TAG, "args must contain extra " + EXTRA_ACCOUNT_NAME);
+ Log.e(TAG, "args must contain extra \"name\"");
return;
}
@@ -128,13 +127,31 @@
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
public static void removeTestAccount(Context context, Bundle args) {
- final String accountName = args.getString(EXTRA_ACCOUNT_NAME);
+ final String accountName = args.getString("name");
if (accountName == null) {
- Log.e(TAG, "args must contain extra " + EXTRA_ACCOUNT_NAME);
+ Log.e(TAG, "args must contain extra \"name\"");
return;
}
- AccountWithDataSet account = new AccountWithDataSet(accountName, TEST_ACCOUNT_TYPE, null);
+ final AccountWithDataSet account = new AccountWithDataSet(accountName, TEST_ACCOUNT_TYPE,
+ null);
new AccountsTestHelper(context).removeTestAccount(account);
}
+
+ public static void setDefaultAccount(Context context, Bundle args) {
+ final String name = args.getString("name");
+ final String type = args.getString("type");
+
+ if (name == null || type == null) {
+ Log.e(TAG, "args must contain extras \"name\" and \"type\"");
+ return;
+ }
+
+ new ContactsPreferences(context).setDefaultAccount(
+ new AccountWithDataSet(name, type, null));
+ }
+
+ public static void clearDefaultAccount(Context context) {
+ new ContactsPreferences(context).clearDefaultAccount();
+ }
}