From 8bb3d1ee5bc37f31051638c1e1303fd829662087 Mon Sep 17 00:00:00 2001 From: Brian Attwell Date: Thu, 15 May 2014 21:55:02 +0000 Subject: Revert "Remove "Help" action from Contacts app" I committed the previous CL thinking it was a different CL. This reverts commit f49a823175cd1201e30410977f33992749de0bb6. Change-Id: I33c24687b1fba1287b944e607cd2b284fef97bad --- src/com/android/contacts/activities/PeopleActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/com/android/contacts/activities/PeopleActivity.java') diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index c7c188ce5..a1699bf75 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -88,7 +88,7 @@ import com.android.contacts.common.util.AccountFilterUtil; import com.android.contacts.util.AccountPromptUtils; import com.android.contacts.common.util.Constants; import com.android.contacts.util.DialogManager; -import com.android.contacts.util.DialogManager; +import com.android.contacts.util.HelpUtils; import com.android.contacts.util.PhoneCapabilityTester; import com.android.contacts.common.util.UriUtils; import com.android.contacts.widget.TransitionAnimationView; @@ -1429,6 +1429,7 @@ public class PeopleActivity extends ContactsActivity MenuItem addGroupMenu = menu.findItem(R.id.menu_add_group); 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) { @@ -1436,6 +1437,7 @@ public class PeopleActivity extends ContactsActivity addGroupMenu.setVisible(false); contactsFilterMenu.setVisible(false); clearFrequentsMenu.setVisible(false); + helpMenu.setVisible(false); } else { switch (mActionBarAdapter.getCurrentTab()) { case TabState.FAVORITES: @@ -1462,6 +1464,7 @@ public class PeopleActivity extends ContactsActivity 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); -- cgit v1.2.3