diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-29 07:30:15 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 07:30:16 +0000 |
| commit | 262b1e75182ecd34e7488c6ac98341c45dc9f24d (patch) | |
| tree | 3a7c53cc7f1543e95d41bdd1ff0d724540272a6e /java/src/com/android/inputmethod/latin/settings | |
| parent | 6dc21bd4e6b4854da65541a431d499489ece7246 (diff) | |
| parent | bbf556e8e1f2b522c555e05ec06c4efefed16e02 (diff) | |
| download | latinime-262b1e75182ecd34e7488c6ac98341c45dc9f24d.tar.gz latinime-262b1e75182ecd34e7488c6ac98341c45dc9f24d.tar.xz latinime-262b1e75182ecd34e7488c6ac98341c45dc9f24d.zip | |
Merge "Remove researcher logger"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/DebugSettings.java | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java index c4c1234fc..5fa15f418 100644 --- a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java +++ b/java/src/com/android/inputmethod/latin/settings/DebugSettings.java @@ -76,7 +76,6 @@ public final class DebugSettings extends PreferenceFragment final CheckBoxPreference checkbox = (CheckBoxPreference)usabilityStudyPref; checkbox.setChecked(prefs.getBoolean(PREF_USABILITY_STUDY_MODE, LatinImeLogger.getUsabilityStudyMode(prefs))); - checkbox.setSummary(R.string.settings_warning_researcher_mode); } final Preference statisticsLoggingPref = findPreference(PREF_STATISTICS_LOGGING); if (statisticsLoggingPref instanceof CheckBoxPreference) { diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java index 302ae4390..af46aad96 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java @@ -41,7 +41,6 @@ import com.android.inputmethod.keyboard.KeyboardTheme; import com.android.inputmethod.latin.AudioAndHapticFeedbackManager; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.SubtypeSwitcher; -import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.setup.LauncherIconVisibilityManager; import com.android.inputmethod.latin.userdictionary.UserDictionaryList; import com.android.inputmethod.latin.userdictionary.UserDictionarySettings; @@ -152,10 +151,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment miscSettings.removePreference(aboutSettings); } } - if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { - // The about screen contains items that may be confusing in development-only versions. - miscSettings.removePreference(aboutSettings); - } final boolean showVoiceKeyOption = res.getBoolean( R.bool.config_enable_show_voice_key_option); |