Merge "Don't show overflow menu options in search mode on phone" (be994059) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/activities/PeopleActivity.java

+15 −13

Original line number	Diff line number	Diff line
		@@ -1262,7 +1262,6 @@ public class PeopleActivity extends ContactsActivity
		}
		makeAllMenuItemsVisible(menu, true);

		final MenuItem searchMenu = menu.findItem(R.id.menu_search);
		final MenuItem addContactMenu = menu.findItem(R.id.menu_add_contact);
		final MenuItem contactsFilterMenu = menu.findItem(R.id.menu_contacts_filter);

		@@ -1271,7 +1270,8 @@ public class PeopleActivity extends ContactsActivity
		addGroupMenu = menu.findItem(R.id.menu_custom_add_group);
		}

		if (mActionBarAdapter.isSearchMode()) {
		final boolean isSearchMode = mActionBarAdapter.isSearchMode();
		if (isSearchMode) {
		addContactMenu.setVisible(false);
		addGroupMenu.setVisible(false);
		contactsFilterMenu.setVisible(false);
		@@ -1299,17 +1299,12 @@ public class PeopleActivity extends ContactsActivity
		break;
		}
		}

		if (searchMenu != null) {
		// Don't show the search menu in search mode.
		searchMenu.setVisible(!mActionBarAdapter.isSearchMode());
		}


		MenuItem settings = menu.findItem(R.id.menu_settings);
		if (settings != null) {
		settings.setVisible(!ContactsPreferenceActivity.isEmpty(this));
		}
		final boolean showMiscOptions = !isSearchMode;
		makeMenuItemVisible(menu, R.id.menu_search, showMiscOptions);
		makeMenuItemVisible(menu, R.id.menu_import_export, showMiscOptions);
		makeMenuItemVisible(menu, R.id.menu_accounts, showMiscOptions);
		makeMenuItemVisible(menu, R.id.menu_settings,
		showMiscOptions && !ContactsPreferenceActivity.isEmpty(this));

		return true;
		}
		@@ -1321,6 +1316,13 @@ public class PeopleActivity extends ContactsActivity
		}
		}

		private void makeMenuItemVisible(Menu menu, int itemId, boolean visible) {
		MenuItem item =menu.findItem(itemId);
		if (item != null) {
		item.setVisible(visible);
		}
		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		switch (item.getItemId()) {