am fe856be8: am f59c4f68: Fix labels in the personal dictionary settings

* commit 'fe856be87573cd2641c6cf71e9b5a03e8b5e2491':
  Fix labels in the personal dictionary settings
main
Satoshi Kataoka 2013-05-15 12:46:51 -07:00 committed by Android Git Automerger
commit 7e5e4c857f
2 changed files with 5 additions and 4 deletions

View File

@ -74,14 +74,14 @@ public class UserDictionaryAddWordFragment extends Fragment
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
final MenuItem actionItemAdd = menu.add(0, OPTIONS_MENU_ADD, 0,
R.string.user_dict_settings_add_menu_title).setIcon(R.drawable.ic_menu_add);
actionItemAdd.setShowAsAction(
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
final MenuItem actionItemDelete = menu.add(0, OPTIONS_MENU_DELETE, 0, final MenuItem actionItemDelete = menu.add(0, OPTIONS_MENU_DELETE, 0,
R.string.user_dict_settings_delete).setIcon(android.R.drawable.ic_menu_delete); R.string.user_dict_settings_delete).setIcon(android.R.drawable.ic_menu_delete);
actionItemDelete.setShowAsAction( actionItemDelete.setShowAsAction(
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
final MenuItem actionItemAdd = menu.add(0, OPTIONS_MENU_ADD, 0,
R.string.user_dict_settings_delete).setIcon(R.drawable.ic_menu_add);
actionItemAdd.setShowAsAction(
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
/** /**

View File

@ -108,6 +108,7 @@ public class UserDictionarySettings extends ListFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getActivity().getActionBar().setTitle(R.string.edit_personal_dictionary);
} }
@Override @Override