Merge "Fix the title of the personal dictionary settings"
commit
323a7aae6c
|
@ -274,4 +274,8 @@ public class UserDictionaryAddWordContents {
|
||||||
localesList.add(new LocaleRenderer(activity, null)); // meaning: select another locale
|
localesList.add(new LocaleRenderer(activity, null)); // meaning: select another locale
|
||||||
return localesList;
|
return localesList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getCurrentUserDictionaryLocale() {
|
||||||
|
return mLocale;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,6 +60,7 @@ public class UserDictionaryAddWordFragment extends Fragment
|
||||||
public void onActivityCreated(final Bundle savedInstanceState) {
|
public void onActivityCreated(final Bundle savedInstanceState) {
|
||||||
super.onActivityCreated(savedInstanceState);
|
super.onActivityCreated(savedInstanceState);
|
||||||
setHasOptionsMenu(true);
|
setHasOptionsMenu(true);
|
||||||
|
getActivity().getActionBar().setTitle(R.string.edit_personal_dictionary);
|
||||||
// Keep the instance so that we remember mContents when configuration changes (eg rotation)
|
// Keep the instance so that we remember mContents when configuration changes (eg rotation)
|
||||||
setRetainInstance(true);
|
setRetainInstance(true);
|
||||||
}
|
}
|
||||||
|
@ -82,6 +83,8 @@ public class UserDictionaryAddWordFragment extends Fragment
|
||||||
mContents = new UserDictionaryAddWordContents(mRootView,
|
mContents = new UserDictionaryAddWordContents(mRootView,
|
||||||
mContents /* oldInstanceToBeEdited */);
|
mContents /* oldInstanceToBeEdited */);
|
||||||
}
|
}
|
||||||
|
getActivity().getActionBar().setSubtitle(UserDictionarySettingsUtils.getLocaleDisplayName(
|
||||||
|
getActivity(), mContents.getCurrentUserDictionaryLocale()));
|
||||||
return mRootView;
|
return mRootView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue