Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 607d35cc authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 323a7aae: Merge "Fix the title of the personal dictionary settings" 

* commit '323a7aae':
  Fix the title of the personal dictionary settings
parents e71d9ab6 323a7aae

java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordContents.java

+4 −0
Original line number Diff line number Diff line
@@ -274,4 +274,8 @@ public class UserDictionaryAddWordContents { 
        localesList.add(new LocaleRenderer(activity, null)); // meaning: select another locale

        return localesList;

    }



    public String getCurrentUserDictionaryLocale() {

        return mLocale;

    }

}

java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class UserDictionaryAddWordFragment extends Fragment 
    public void onActivityCreated(final Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        setHasOptionsMenu(true);

        getActivity().getActionBar().setTitle(R.string.edit_personal_dictionary);

        // Keep the instance so that we remember mContents when configuration changes (eg rotation)

        setRetainInstance(true);

    }
@@ -82,6 +83,8 @@ public class UserDictionaryAddWordFragment extends Fragment 
            mContents = new UserDictionaryAddWordContents(mRootView,

                    mContents /* oldInstanceToBeEdited */);

        }

        getActivity().getActionBar().setSubtitle(UserDictionarySettingsUtils.getLocaleDisplayName(

                getActivity(), mContents.getCurrentUserDictionaryLocale()));

        return mRootView;

    }