diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-06 05:25:41 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:07:36 +0000 |
| commit | aa3ff194cd1bae2e7dd7aa436877a444ea140511 (patch) | |
| tree | 48c0ac7cecab983ab51ec553c694ced958341180 /java/src | |
| parent | 4efa2c0cdbc56ba0a43dc34b42c512941678ae70 (diff) | |
| parent | f7d1dc2b5ef3c0ff3b655528a0324c3fc3ab03f3 (diff) | |
| download | latinime-aa3ff194cd1bae2e7dd7aa436877a444ea140511.tar.gz latinime-aa3ff194cd1bae2e7dd7aa436877a444ea140511.tar.xz latinime-aa3ff194cd1bae2e7dd7aa436877a444ea140511.zip | |
Merge "Use add icon for add custom input style menu" into lmp-dev
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java index 21f2afd01..6d7f53cf0 100644 --- a/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java @@ -63,7 +63,6 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment { private AlertDialog mSubtypeEnablerNotificationDialog; private String mSubtypePreferenceKeyForSubtypeEnabler; - private static final int MENU_ADD_SUBTYPE = Menu.FIRST; private static final String KEY_IS_ADDING_NEW_SUBTYPE = "is_adding_new_subtype"; private static final String KEY_IS_SUBTYPE_ENABLER_NOTIFICATION_DIALOG_OPEN = "is_subtype_enabler_notification_dialog_open"; @@ -581,14 +580,13 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment { @Override public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) { - final MenuItem addSubtypeMenu = menu.add(0, MENU_ADD_SUBTYPE, 0, R.string.add_style); - addSubtypeMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + inflater.inflate(R.menu.add_style, menu); } @Override public boolean onOptionsItemSelected(final MenuItem item) { final int itemId = item.getItemId(); - if (itemId == MENU_ADD_SUBTYPE) { + if (itemId == R.id.action_add_style) { final SubtypePreference newSubtype = SubtypePreference.newIncompleteSubtypePreference(getActivity(), mSubtypeProxy); getPreferenceScreen().addPreference(newSubtype); |