Merge "Add press-states to ContactDetailFragment." into jb-dev
diff --git a/res/menu-sw580dp-w720dp/people_options.xml b/res/menu-sw580dp-w720dp/people_options.xml
index 6974d80..cb65cc8 100644
--- a/res/menu-sw580dp-w720dp/people_options.xml
+++ b/res/menu-sw580dp-w720dp/people_options.xml
@@ -44,15 +44,21 @@
<item
android:id="@+id/menu_clear_frequents"
+ android:orderInCategory="3"
android:title="@string/menu_clear_frequents" />
<item
android:id="@+id/menu_accounts"
- android:orderInCategory="3"
+ android:orderInCategory="4"
android:title="@string/menu_accounts" />
<item
android:id="@+id/menu_settings"
- android:orderInCategory="4"
+ android:orderInCategory="5"
android:title="@string/menu_settings" />
+
+ <item
+ android:id="@+id/menu_help"
+ android:orderInCategory="6"
+ android:title="@string/menu_help" />
</menu>
diff --git a/res/menu-sw580dp/people_options.xml b/res/menu-sw580dp/people_options.xml
index 07d9c94..42c4749 100644
--- a/res/menu-sw580dp/people_options.xml
+++ b/res/menu-sw580dp/people_options.xml
@@ -47,15 +47,21 @@
<item
android:id="@+id/menu_clear_frequents"
+ android:orderInCategory="3"
android:title="@string/menu_clear_frequents" />
<item
android:id="@+id/menu_accounts"
- android:orderInCategory="3"
+ android:orderInCategory="4"
android:title="@string/menu_accounts" />
<item
android:id="@+id/menu_settings"
- android:orderInCategory="4"
+ android:orderInCategory="5"
android:title="@string/menu_settings" />
+
+ <item
+ android:id="@+id/menu_help"
+ android:orderInCategory="6"
+ android:title="@string/menu_help" />
</menu>
diff --git a/res/menu/edit_contact.xml b/res/menu/edit_contact.xml
index 93c19dc..51d9ab0 100644
--- a/res/menu/edit_contact.xml
+++ b/res/menu/edit_contact.xml
@@ -32,4 +32,8 @@
android:id="@+id/menu_discard"
android:alphabeticShortcut="q"
android:title="@string/menu_discard" />
+
+ <item
+ android:id="@+id/menu_help"
+ android:title="@string/menu_help" />
</menu>
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index 4003038..8c91e88 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -51,4 +51,8 @@
<item
android:id="@+id/menu_settings"
android:title="@string/menu_settings" />
+
+ <item
+ android:id="@+id/menu_help"
+ android:title="@string/menu_help" />
</menu>
diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml
index b36dbe1..d3b7420 100644
--- a/res/values/donottranslate_config.xml
+++ b/res/values/donottranslate_config.xml
@@ -130,4 +130,17 @@
Setting this flag to false in a resource overlay allows you to
entirely disable SIM import on a per-product basis. -->
<bool name="config_allow_sim_import">true</bool>
+
+
+ <!-- Help URL pointing to main TOC for People. This is intentionally empty because
+ the overlay will fill this in during build time. -->
+ <string name="help_url_people_main"></string>
+
+ <!-- Help URL pointing to adding contacts in People. This is intentionally empty because
+ the overlay will fill this in during build time. -->
+ <string name="help_url_people_add"></string>
+
+ <!-- Help URL pointing to editing contacts in People. This is intentionally empty because
+ the overlay will fill this in during build time. -->
+ <string name="help_url_people_edit"></string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c5d0703..b2480cd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1452,6 +1452,9 @@
<!-- Menu item for the settings activity [CHAR LIMIT=64] -->
<string name="menu_settings" msgid="377929915873428211">Settings</string>
+ <!-- Menu item for invoking contextual help [CHAR LIMIT=64] -->
+ <string name="menu_help">Help</string>
+
<!-- The preference section title for contact display options [CHAR LIMIT=128] -->
<string name="preference_displayOptions">Display options</string>
diff --git a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
index f98e47b..becbf5c 100644
--- a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
+++ b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
@@ -21,6 +21,7 @@
import com.android.contacts.editor.ViewIdGenerator;
import com.android.contacts.model.AccountType;
import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.AccountWithDataSet;
import com.android.contacts.model.DataKind;
import com.android.contacts.model.EntityDelta;
import com.android.contacts.model.EntityDelta.ValuesDelta;
@@ -37,6 +38,7 @@
import android.content.ContentProviderResult;
import android.content.ContentResolver;
import android.content.ContentUris;
+import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.OperationApplicationException;
@@ -54,6 +56,7 @@
import android.provider.ContactsContract.CommonDataKinds.Nickname;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
@@ -73,6 +76,7 @@
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
/**
* This is a dialog-themed activity for confirming the addition of a detail to an existing contact
@@ -82,6 +86,18 @@
* {@link android.provider.ContactsContract.Intents.Insert#PHONE_TYPE} or
* {@link android.provider.ContactsContract.Intents.Insert#EMAIL} with type
* {@link android.provider.ContactsContract.Intents.Insert#EMAIL_TYPE} intent keys.
+ *
+ * If the selected contact doesn't contain editable raw_contacts, it'll create a new raw_contact
+ * on the first editable account found, and the data will be added to this raw_contact. The newly
+ * created raw_contact will be joined with the selected contact with aggregation-exceptions.
+ *
+ * TODO: Don't open this activity if there's no editable accounts.
+ * If there's no editable accounts on the system, we'll set {@link #mIsReadOnly} and the dialog
+ * just says "contact is not editable". It's slightly misleading because this really means
+ * "there's no editable accounts", but in this case we shouldn't show the contact picker in the
+ * first place.
+ * Note when there's no accounts, it *is* okay to show the picker / dialog, because the local-only
+ * contacts are writable.
*/
public class ConfirmAddDetailActivity extends Activity implements
DialogManager.DialogShowingViewActivity {
@@ -413,6 +429,12 @@
if (activityTarget.isFinishing()) {
return;
}
+ if ((entityList == null) || (entityList.size() == 0)) {
+ Log.e(TAG, "Contact not found.");
+ activityTarget.finish();
+ return;
+ }
+
activityTarget.setEntityDeltaList(entityList);
}
}
@@ -555,9 +577,20 @@
mEntityDeltaList = entityList;
- // Find the editable type.
+ // Find the editable raw_contact.
mEntityDelta = mEntityDeltaList.getFirstWritableRawContact(this);
+
+ // If no editable raw_contacts are found, create one.
if (mEntityDelta == null) {
+ mEntityDelta = addEditableRawContact(this, mEntityDeltaList);
+
+ if ((mEntityDelta != null) && VERBOSE_LOGGING) {
+ Log.v(TAG, "setEntityDeltaList: created editable raw_contact " + entityList);
+ }
+ }
+
+ if (mEntityDelta == null) {
+ // Selected contact is read-only, and there's no editable account.
mIsReadOnly = true;
mEditableAccountType = null;
} else {
@@ -577,6 +610,67 @@
}
/**
+ * Create an {@link EntityDelta} for a raw_contact on the first editable account found, and add
+ * to the list. Also copy the structured name from an existing (read-only) raw_contact to the
+ * new one, if any of the read-only contacts has a name.
+ */
+ private static EntityDelta addEditableRawContact(Context context,
+ EntityDeltaList entityDeltaList) {
+ // First, see if there's an editable account.
+ final AccountTypeManager accounts = AccountTypeManager.getInstance(context);
+ final List<AccountWithDataSet> editableAccounts = accounts.getAccounts(true);
+ if (editableAccounts.size() == 0) {
+ // No editable account type found. The dialog will be read-only mode.
+ return null;
+ }
+ final AccountWithDataSet editableAccount = editableAccounts.get(0);
+ final AccountType accountType = accounts.getAccountType(
+ editableAccount.type, editableAccount.dataSet);
+
+ // Create a new EntityDelta for the new raw_contact.
+ final ContentValues values = new ContentValues();
+ values.put(RawContacts.ACCOUNT_NAME, editableAccount.name);
+ values.put(RawContacts.ACCOUNT_TYPE, editableAccount.type);
+ values.put(RawContacts.DATA_SET, editableAccount.dataSet);
+
+ final EntityDelta entityDelta = new EntityDelta(ValuesDelta.fromAfter(values));
+
+ // Then, copy the structure name from an existing (read-only) raw_contact.
+ for (EntityDelta entity : entityDeltaList) {
+ final ArrayList<ValuesDelta> readOnlyNames =
+ entity.getMimeEntries(StructuredName.CONTENT_ITEM_TYPE);
+ if ((readOnlyNames != null) && (readOnlyNames.size() > 0)) {
+ final ValuesDelta readOnlyName = readOnlyNames.get(0);
+
+ final ValuesDelta newName = EntityModifier.ensureKindExists(entityDelta,
+ accountType, StructuredName.CONTENT_ITEM_TYPE);
+
+ // Copy all the data fields.
+ newName.copyStringFrom(readOnlyName, StructuredName.DISPLAY_NAME);
+
+ newName.copyStringFrom(readOnlyName, StructuredName.GIVEN_NAME);
+ newName.copyStringFrom(readOnlyName, StructuredName.FAMILY_NAME);
+ newName.copyStringFrom(readOnlyName, StructuredName.PREFIX);
+ newName.copyStringFrom(readOnlyName, StructuredName.MIDDLE_NAME);
+ newName.copyStringFrom(readOnlyName, StructuredName.SUFFIX);
+
+ newName.copyStringFrom(readOnlyName, StructuredName.PHONETIC_GIVEN_NAME);
+ newName.copyStringFrom(readOnlyName, StructuredName.PHONETIC_MIDDLE_NAME);
+ newName.copyStringFrom(readOnlyName, StructuredName.PHONETIC_FAMILY_NAME);
+
+ newName.copyStringFrom(readOnlyName, StructuredName.FULL_NAME_STYLE);
+ newName.copyStringFrom(readOnlyName, StructuredName.PHONETIC_NAME_STYLE);
+ break;
+ }
+ }
+
+ // Add the new EntityDelta to the list.
+ entityDeltaList.add(entityDelta);
+
+ return entityDelta;
+ }
+
+ /**
* Rebuild the editor to match our underlying {@link #mEntityDeltaList} object.
*/
private void bindEditor() {
@@ -724,6 +818,9 @@
while (tries++ < PERSIST_TRIES) {
try {
// Build operations and try applying
+ // Note: In case we've created a new raw_contact because the selected contact
+ // is read-only, buildDiff() will create aggregation exceptions to join
+ // the new one to the existing contact.
final ArrayList<ContentProviderOperation> diff = state.buildDiff();
ContentProviderResult[] results = null;
if (!diff.isEmpty()) {
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 0283e06..eff3294 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -57,6 +57,7 @@
import com.android.contacts.util.AccountFilterUtil;
import com.android.contacts.util.AccountPromptUtils;
import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.HelpUtils;
import com.android.contacts.util.UriUtils;
import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
import com.android.contacts.util.Constants;
@@ -1395,6 +1396,7 @@
}
final MenuItem clearFrequentsMenu = menu.findItem(R.id.menu_clear_frequents);
+ final MenuItem helpMenu = menu.findItem(R.id.menu_help);
final boolean isSearchMode = mActionBarAdapter.isSearchMode();
if (isSearchMode) {
@@ -1402,6 +1404,7 @@
addGroupMenu.setVisible(false);
contactsFilterMenu.setVisible(false);
clearFrequentsMenu.setVisible(false);
+ helpMenu.setVisible(false);
} else {
switch (mActionBarAdapter.getCurrentTab()) {
case TabState.FAVORITES:
@@ -1428,6 +1431,7 @@
clearFrequentsMenu.setVisible(false);
break;
}
+ HelpUtils.prepareHelpMenuItem(this, helpMenu, R.string.help_url_people_main);
}
final boolean showMiscOptions = !isSearchMode;
makeMenuItemVisible(menu, R.id.menu_search, showMiscOptions);
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 275a463..2d61fbc 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -36,6 +36,7 @@
import com.android.contacts.model.GoogleAccountType;
import com.android.contacts.util.AccountsListAdapter;
import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.util.HelpUtils;
import android.accounts.Account;
import android.app.Activity;
@@ -895,14 +896,31 @@
// This supports the keyboard shortcut to save changes to a contact but shouldn't be visible
// because the custom action bar contains the "save" button now (not the overflow menu).
// TODO: Find a better way to handle shortcuts, i.e. onKeyDown()?
- menu.findItem(R.id.menu_done).setVisible(false);
+ final MenuItem doneMenu = menu.findItem(R.id.menu_done);
+ final MenuItem splitMenu = menu.findItem(R.id.menu_split);
+ final MenuItem joinMenu = menu.findItem(R.id.menu_join);
+ final MenuItem helpMenu = menu.findItem(R.id.menu_help);
+
+ // Set visibility of menus
+ doneMenu.setVisible(false);
// Split only if more than one raw profile and not a user profile
- menu.findItem(R.id.menu_split).setVisible(mState != null && mState.size() > 1 &&
- !isEditingUserProfile());
- // Cannot join a user profile
- menu.findItem(R.id.menu_join).setVisible(!isEditingUserProfile());
+ splitMenu.setVisible(mState != null && mState.size() > 1 && !isEditingUserProfile());
+ // Cannot join a user profile
+ joinMenu.setVisible(!isEditingUserProfile());
+
+ // help menu depending on whether this is inserting or editing
+ if (Intent.ACTION_INSERT.equals(mAction)) {
+ // inserting
+ HelpUtils.prepareHelpMenuItem(getActivity(), helpMenu, R.string.help_url_people_add);
+ } else if (Intent.ACTION_EDIT.equals(mAction)) {
+ // editing
+ HelpUtils.prepareHelpMenuItem(getActivity(), helpMenu, R.string.help_url_people_edit);
+ } else {
+ // something else, so don't show the help menu
+ helpMenu.setVisible(false);
+ }
int size = menu.size();
for (int i = 0; i < size; i++) {
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index 742c716..a92c49c 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -253,6 +253,7 @@
mPopup.setAnchorView(mGroupList);
mPopup.setAdapter(mAdapter);
mPopup.setModal(true);
+ mPopup.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
mPopup.show();
ListView listView = mPopup.getListView();
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index f3de16c..8d30c3c 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -415,7 +415,9 @@
// Status view height is the biggest of the text view and the presence icon
if (isVisible(mPresenceIcon)) {
- mPresenceIcon.measure(mPresenceIconSize, mPresenceIconSize);
+ mPresenceIcon.measure(
+ MeasureSpec.makeMeasureSpec(mPresenceIconSize, MeasureSpec.EXACTLY),
+ MeasureSpec.makeMeasureSpec(mPresenceIconSize, MeasureSpec.EXACTLY));
mStatusTextViewHeight = mPresenceIcon.getMeasuredHeight();
}
diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index f8fc4cd..1c526a5 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -16,6 +16,7 @@
package com.android.contacts.list;
import com.android.contacts.R;
+import com.android.contacts.list.JoinContactLoader.JoinContactLoaderResult;
import android.app.Activity;
import android.app.LoaderManager.LoaderCallbacks;
@@ -78,13 +79,14 @@
break;
}
case JoinContactListAdapter.PARTITION_ALL_CONTACTS: {
- Cursor suggestionsCursor = ((JoinContactLoader) loader).getSuggestionsCursor();
+ Cursor suggestionsCursor = ((JoinContactLoaderResult) data).suggestionCursor;
onContactListLoaded(suggestionsCursor, data);
break;
}
}
}
+ @Override
public void onLoaderReset(Loader<Cursor> loader) {
}
};
diff --git a/src/com/android/contacts/list/JoinContactLoader.java b/src/com/android/contacts/list/JoinContactLoader.java
index c43560e..beb5208 100644
--- a/src/com/android/contacts/list/JoinContactLoader.java
+++ b/src/com/android/contacts/list/JoinContactLoader.java
@@ -18,19 +18,46 @@
import android.content.Context;
import android.content.CursorLoader;
import android.database.Cursor;
-import android.database.MatrixCursor;
+import android.database.CursorWrapper;
import android.net.Uri;
-import android.util.Log;
/**
* A specialized loader for the Join Contacts UI. It executes two queries:
* join suggestions and (optionally) the full contact list.
+ *
+ * This loader also loads the "suggestion" cursor, which can be accessed with:
+ * {@code ((JoinContactLoaderResult) result).suggestionCursor }
*/
public class JoinContactLoader extends CursorLoader {
private String[] mProjection;
private Uri mSuggestionUri;
- private Cursor mSuggestionsCursor;
+
+ /**
+ * Actual returned class. It's guaranteed that this loader always returns an instance of this
+ * class. This class is needed to tie the lifecycle of the second cursor to that of the
+ * primary one.
+ *
+ * Note we can't change the result type of this loader itself, because CursorLoader
+ * extends AsyncTaskLoader<Cursor>, not AsyncTaskLoader<? extends Cursor>
+ */
+ public static class JoinContactLoaderResult extends CursorWrapper {
+ public final Cursor suggestionCursor;
+
+ public JoinContactLoaderResult(Cursor baseCursor, Cursor suggestionCursor) {
+ super(baseCursor);
+ this.suggestionCursor = suggestionCursor;
+ }
+
+ @Override
+ public void close() {
+ try {
+ suggestionCursor.close();
+ } finally {
+ super.close();
+ }
+ }
+ }
public JoinContactLoader(Context context) {
super(context, null, null, null, null, null);
@@ -46,16 +73,12 @@
this.mProjection = projection;
}
- public Cursor getSuggestionsCursor() {
- return mSuggestionsCursor;
- }
-
@Override
public Cursor loadInBackground() {
// First execute the suggestions query, then call super.loadInBackground
// to load the entire list
- mSuggestionsCursor = getContext().getContentResolver()
+ final Cursor suggestionsCursor = getContext().getContentResolver()
.query(mSuggestionUri, mProjection, null, null, null);
- return super.loadInBackground();
+ return new JoinContactLoaderResult(super.loadInBackground(), suggestionsCursor);
}
}
\ No newline at end of file
diff --git a/src/com/android/contacts/model/EntityDelta.java b/src/com/android/contacts/model/EntityDelta.java
index bc6ba59..0f45a4b 100644
--- a/src/com/android/contacts/model/EntityDelta.java
+++ b/src/com/android/contacts/model/EntityDelta.java
@@ -781,6 +781,11 @@
mAfter.putNull(key);
}
+ public void copyStringFrom(ValuesDelta from, String key) {
+ ensureUpdate();
+ put(key, from.getAsString(key));
+ }
+
/**
* Return set of all keys defined through this object.
*/
diff --git a/src/com/android/contacts/quickcontact/ResolveCache.java b/src/com/android/contacts/quickcontact/ResolveCache.java
index aae2ee7..026e0f4 100644
--- a/src/com/android/contacts/quickcontact/ResolveCache.java
+++ b/src/com/android/contacts/quickcontact/ResolveCache.java
@@ -46,13 +46,18 @@
* multiple {@link ResolveInfo} are found to match. This only happens when
* the user has not selected a default app yet, and they will still be
* presented with the system disambiguation dialog.
+ * If several of this list match (e.g. Android Browser vs. Chrome), we will pick either one
*/
private static final HashSet<String> sPreferResolve = Sets.newHashSet(
"com.android.email",
- "com.android.calendar",
- "com.android.contacts",
- "com.android.mms",
+ "com.google.android.email",
+
"com.android.phone",
+
+ "com.google.android.apps.maps",
+
+ "com.android.chrome",
+ "com.google.android.browser",
"com.android.browser");
private final Context mContext;
diff --git a/src/com/android/contacts/util/HelpUtils.java b/src/com/android/contacts/util/HelpUtils.java
new file mode 100644
index 0000000..814e3ab
--- /dev/null
+++ b/src/com/android/contacts/util/HelpUtils.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2012 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.contacts.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.MenuItem;
+
+import java.util.Locale;
+
+/**
+ * Functions to easily prepare contextual help menu option items with an intent that opens up the
+ * browser to a particular URL, while taking into account the preferred language and app version.
+ */
+public class HelpUtils {
+ private final static String TAG = HelpUtils.class.getName();
+
+ /**
+ * Help URL query parameter key for the preferred language.
+ */
+ private final static String PARAM_LANGUAGE_CODE = "hl";
+
+ /**
+ * Help URL query parameter key for the app version.
+ */
+ private final static String PARAM_VERSION = "version";
+
+ /**
+ * Cached version code to prevent repeated calls to the package manager.
+ */
+ private static String sCachedVersionCode = null;
+
+ /** Static helper that is not instantiable*/
+ private HelpUtils() { }
+
+ /**
+ * Prepares the help menu item by doing the following.
+ * - If the string corresponding to the helpUrlResourceId is empty or null, then the help menu
+ * item is made invisible.
+ * - Otherwise, this makes the help menu item visible and sets the intent for the help menu
+ * item to view the URL.
+ *
+ * @return returns whether the help menu item has been made visible.
+ */
+ public static boolean prepareHelpMenuItem(Context context, MenuItem helpMenuItem,
+ int helpUrlResourceId) {
+ String helpUrlString = context.getResources().getString(helpUrlResourceId);
+ return prepareHelpMenuItem(context, helpMenuItem, helpUrlString);
+ }
+
+ /**
+ * Prepares the help menu item by doing the following.
+ * - If the helpUrlString is empty or null, the help menu item is made invisible.
+ * - Otherwise, this makes the help menu item visible and sets the intent for the help menu
+ * item to view the URL.
+ *
+ * @return returns whether the help menu item has been made visible.
+ */
+ public static boolean prepareHelpMenuItem(Context context, MenuItem helpMenuItem,
+ String helpUrlString) {
+ if (TextUtils.isEmpty(helpUrlString)) {
+ // The help url string is empty or null, so set the help menu item to be invisible.
+ helpMenuItem.setVisible(false);
+
+ // return that the help menu item is not visible (i.e. false)
+ return false;
+ } else {
+ // The help url string exists, so first add in some extra query parameters.
+ final Uri fullUri = uriWithAddedParameters(context, Uri.parse(helpUrlString));
+
+ // Then, create an intent that will be fired when the user
+ // selects this help menu item.
+ Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
+ // Set the intent to the help menu item, show the help menu item in the overflow
+ // menu, and make it visible.
+ helpMenuItem.setIntent(intent);
+ helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ helpMenuItem.setVisible(true);
+
+ // return that the help menu item is visible (i.e., true)
+ return true;
+ }
+ }
+
+ /**
+ * Adds two query parameters into the Uri, namely the language code and the version code
+ * of the app's package as gotten via the context.
+ * @return the uri with added query parameters
+ */
+ private static Uri uriWithAddedParameters(Context context, Uri baseUri) {
+ Uri.Builder builder = baseUri.buildUpon();
+
+ // Add in the preferred language
+ builder.appendQueryParameter(PARAM_LANGUAGE_CODE, Locale.getDefault().toString());
+
+ // Add in the package version code
+ if (sCachedVersionCode == null) {
+ // There is no cached version code, so try to get it from the package manager.
+ try {
+ // cache the version code
+ PackageInfo info = context.getPackageManager().getPackageInfo(
+ context.getPackageName(), 0);
+ sCachedVersionCode = Integer.toString(info.versionCode);
+
+ // append the version code to the uri
+ builder.appendQueryParameter(PARAM_VERSION, sCachedVersionCode);
+ } catch (NameNotFoundException e) {
+ // Cannot find the package name, so don't add in the version parameter
+ // This shouldn't happen.
+ Log.wtf(TAG, "Invalid package name for context", e);
+ }
+ } else {
+ builder.appendQueryParameter(PARAM_VERSION, sCachedVersionCode);
+ }
+
+ // Build the full uri and return it
+ return builder.build();
+ }
+}
diff --git a/tests/res/values/donottranslate_strings.xml b/tests/res/values/donottranslate_strings.xml
index 6db9e8b..be6b5a7 100644
--- a/tests/res/values/donottranslate_strings.xml
+++ b/tests/res/values/donottranslate_strings.xml
@@ -46,6 +46,8 @@
<item>ACTION_GET_CONTENT: postal</item>
<item>ACTION_GET_CONTENT: postal (legacy)</item>
<item>ACTION_INSERT_OR_EDIT</item>
+ <item>ACTION_INSERT_OR_EDIT_PHONE_NUMBER</item>
+ <item>ACTION_INSERT_OR_EDIT_EMAIL_ADDRESS</item>
<item>ACTION_SEARCH (call button)</item>
<item>ACTION_SEARCH: contact</item>
<item>ACTION_SEARCH: email</item>
diff --git a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
index 0d9383f..c6577b8 100644
--- a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
+++ b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
@@ -90,6 +90,8 @@
ACTION_GET_CONTENT_POSTAL,
ACTION_GET_CONTENT_POSTAL_LEGACY,
ACTION_INSERT_OR_EDIT,
+ ACTION_INSERT_OR_EDIT_PHONE_NUMBER,
+ ACTION_INSERT_OR_EDIT_EMAIL_ADDRESS,
ACTION_SEARCH_CALL,
ACTION_SEARCH_CONTACT,
ACTION_SEARCH_EMAIL,
@@ -275,6 +277,20 @@
startActivity(intent);
break;
}
+ case ACTION_INSERT_OR_EDIT_PHONE_NUMBER: {
+ Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
+ intent.setType(Contacts.CONTENT_ITEM_TYPE);
+ intent.putExtra(Insert.PHONE, "5123456789");
+ startActivity(intent);
+ break;
+ }
+ case ACTION_INSERT_OR_EDIT_EMAIL_ADDRESS: {
+ Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
+ intent.setType(Contacts.CONTENT_ITEM_TYPE);
+ intent.putExtra(Insert.EMAIL, "android@android.com");
+ startActivity(intent);
+ break;
+ }
case ACTION_SEARCH_CALL: {
Intent intent = new Intent(Intent.ACTION_SEARCH);
intent.putExtra(SearchManager.ACTION_MSG, "call");