Loading java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java +3 −1 Original line number Diff line number Diff line Loading @@ -150,7 +150,9 @@ public class UserDictionarySettings extends ListFragment { listView.setEmptyView(emptyView); setHasOptionsMenu(true); // Show the language as a subtitle of the action bar getActivity().getActionBar().setSubtitle( UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale)); } @SuppressWarnings("deprecation") Loading java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettingsUtils.java 0 → 100644 +42 −0 Original line number Diff line number Diff line /* * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.android.inputmethod.latin.userdictionary; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.utils.LocaleUtils; import android.content.Context; import android.text.TextUtils; import java.util.Locale; /** * Utilities of the user dictionary settings * TODO: We really want to move these utilities to a static library. */ public class UserDictionarySettingsUtils { public static String getLocaleDisplayName(Context context, String localeStr) { if (TextUtils.isEmpty(localeStr)) { // CAVEAT: localeStr should not be null because a null locale stands for the system // locale in UserDictionary.Words.addWord. return context.getResources().getString(R.string.user_dict_settings_all_languages); } final Locale locale = LocaleUtils.constructLocaleFromString(localeStr); final Locale systemLocale = context.getResources().getConfiguration().locale; return locale.getDisplayName(systemLocale); } } Loading
java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java +3 −1 Original line number Diff line number Diff line Loading @@ -150,7 +150,9 @@ public class UserDictionarySettings extends ListFragment { listView.setEmptyView(emptyView); setHasOptionsMenu(true); // Show the language as a subtitle of the action bar getActivity().getActionBar().setSubtitle( UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale)); } @SuppressWarnings("deprecation") Loading
java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettingsUtils.java 0 → 100644 +42 −0 Original line number Diff line number Diff line /* * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.android.inputmethod.latin.userdictionary; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.utils.LocaleUtils; import android.content.Context; import android.text.TextUtils; import java.util.Locale; /** * Utilities of the user dictionary settings * TODO: We really want to move these utilities to a static library. */ public class UserDictionarySettingsUtils { public static String getLocaleDisplayName(Context context, String localeStr) { if (TextUtils.isEmpty(localeStr)) { // CAVEAT: localeStr should not be null because a null locale stands for the system // locale in UserDictionary.Words.addWord. return context.getResources().getString(R.string.user_dict_settings_all_languages); } final Locale locale = LocaleUtils.constructLocaleFromString(localeStr); final Locale systemLocale = context.getResources().getConfiguration().locale; return locale.getDisplayName(systemLocale); } }