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

am 1c70a8e1: Merge "Add info log of custom input styles" 

* commit '1c70a8e147cebd045ab4963751bbcb7b9bbc1962':
  Add info log of custom input styles
main
Tadashi G. Takaoka 2014-09-26 04:02:48 +00:00 committed by Android Git Automerger
parent 4127e06cdd 1c70a8e147
commit 2420c5b242
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
View File

@ -32,6 +32,7 @@ import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -59,6 +60,12 @@ import java.util.ArrayList;
import java.util.TreeSet; import java.util.TreeSet;
public final class CustomInputStyleSettingsFragment extends PreferenceFragment { public final class CustomInputStyleSettingsFragment extends PreferenceFragment {
private static final String TAG = CustomInputStyleSettingsFragment.class.getSimpleName();
private static final boolean DEBUG_SUBTYPE_ID = false;
// Note: We would like to turn this debug flag true in order to see what input styles are
// defined in a bug-report.
private static final boolean DEBUG_CUSTOM_INPUT_STYLES = true;
private RichInputMethodManager mRichImm; private RichInputMethodManager mRichImm;
private SharedPreferences mPrefs; private SharedPreferences mPrefs;
private SubtypeLocaleAdapter mSubtypeLocaleAdapter; private SubtypeLocaleAdapter mSubtypeLocaleAdapter;
@ -96,8 +103,7 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment {
} }
static final class SubtypeLocaleAdapter extends ArrayAdapter<SubtypeLocaleItem> { static final class SubtypeLocaleAdapter extends ArrayAdapter<SubtypeLocaleItem> {
private static final String TAG = SubtypeLocaleAdapter.class.getSimpleName(); private static final String TAG_SUBTYPE = SubtypeLocaleAdapter.class.getSimpleName();
private static final boolean DEBUG_SUBTYPE_ID = false;
public SubtypeLocaleAdapter(final Context context) { public SubtypeLocaleAdapter(final Context context) {
super(context, android.R.layout.simple_spinner_item); super(context, android.R.layout.simple_spinner_item);
@ -110,7 +116,7 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
final InputMethodSubtype subtype = imi.getSubtypeAt(i); final InputMethodSubtype subtype = imi.getSubtypeAt(i);
if (DEBUG_SUBTYPE_ID) { if (DEBUG_SUBTYPE_ID) {
android.util.Log.d(TAG, String.format("%-6s 0x%08x %11d %s", Log.d(TAG_SUBTYPE, String.format("%-6s 0x%08x %11d %s",
subtype.getLocale(), subtype.hashCode(), subtype.hashCode(), subtype.getLocale(), subtype.hashCode(), subtype.hashCode(),
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(subtype))); SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(subtype)));
} }
@ -445,6 +451,9 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment {
final String prefSubtypes = final String prefSubtypes =
Settings.readPrefAdditionalSubtypes(mPrefs, getResources()); Settings.readPrefAdditionalSubtypes(mPrefs, getResources());
if (DEBUG_CUSTOM_INPUT_STYLES) {
Log.i(TAG, "Load custom input styles: " + prefSubtypes);
}
setPrefSubtypes(prefSubtypes, context); setPrefSubtypes(prefSubtypes, context);
mIsAddingNewSubtype = (savedInstanceState != null) mIsAddingNewSubtype = (savedInstanceState != null)
@ -611,6 +620,9 @@ public final class CustomInputStyleSettingsFragment extends PreferenceFragment {
final String oldSubtypes = Settings.readPrefAdditionalSubtypes(mPrefs, getResources()); final String oldSubtypes = Settings.readPrefAdditionalSubtypes(mPrefs, getResources());
final InputMethodSubtype[] subtypes = getSubtypes(); final InputMethodSubtype[] subtypes = getSubtypes();
final String prefSubtypes = AdditionalSubtypeUtils.createPrefSubtypes(subtypes); final String prefSubtypes = AdditionalSubtypeUtils.createPrefSubtypes(subtypes);
if (DEBUG_CUSTOM_INPUT_STYLES) {
Log.i(TAG, "Save custom input styles: " + prefSubtypes);
}
if (prefSubtypes.equals(oldSubtypes)) { if (prefSubtypes.equals(oldSubtypes)) {
return; return;
} }