nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am ab2d2731: Merge "Fix the displayed name of the personal dictionary"

Browse source 
* commit 'ab2d273133a8fe2e1e0a66952d74127629394a4c':
  Fix the displayed name of the personal dictionary
This commit is contained in:
Satoshi Kataoka 2013-07-29 21:25:52 -07:00 committed by Android Git Automerger
commit e71d9ab6da
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java
View file

@ -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")

42
java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettingsUtils.java Normal file
View file

@ -0,0 +1,42 @@
/*
* 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);
}
}