Merge "Import translations. DO NOT MERGE" into ub-contactsdialer-i-dev
diff --git a/src/com/android/contacts/Experiments.java b/src/com/android/contacts/Experiments.java
index c371a3e..663f0d9 100644
--- a/src/com/android/contacts/Experiments.java
+++ b/src/com/android/contacts/Experiments.java
@@ -21,6 +21,21 @@
public final class Experiments {
/**
+ * The maximum time to wait before showing initial results in the assistants view.
+ *
+ * Default value is 2 seconds.
+ */
+ public static final String ASSISTANT_DISPLAY_INITIAL_RESULTS_TIMEOUT =
+ "Assistant__display_initial_results_timeout";
+
+ /**
+ * The maximum time to wait before timing out non-responsive assistants
+ *
+ * Default value is 10 seconds.
+ */
+ public static final String ASSISTANT_MAXIMUM_TIMEOUT = "Assistant__maximum_timeout";
+
+ /**
* Whether to open contact sheet (aka smart profile) instead of our own QuickContact.
*/
public static final String CONTACT_SHEET = "QuickContact__contact_sheet";
diff --git a/src/com/android/contacts/list/ContactPickerFragment.java b/src/com/android/contacts/list/ContactPickerFragment.java
index 2cb4c71..e1f33b4 100644
--- a/src/com/android/contacts/list/ContactPickerFragment.java
+++ b/src/com/android/contacts/list/ContactPickerFragment.java
@@ -21,6 +21,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.AdapterView;
import com.android.contacts.R;
import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
@@ -87,6 +88,15 @@
}
@Override
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+ if (position == 0 && mCreateContactEnabled && mListener != null) {
+ mListener.onCreateNewContactAction();
+ } else {
+ super.onItemClick(parent, view, position, id);
+ }
+ }
+
+ @Override
protected void onItemClick(int position, long id) {
Uri uri;
if (isLegacyCompatibilityMode()) {
@@ -140,15 +150,6 @@
}
@Override
- protected void configureAdapter() {
- super.configureAdapter();
-
- ContactEntryListAdapter adapter = getAdapter();
-
- adapter.setEmptyListEnabled(true);
- }
-
- @Override
protected View inflateView(LayoutInflater inflater, ViewGroup container) {
return inflater.inflate(R.layout.contact_picker_content, null);
}