aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-16 19:24:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-16 19:24:46 -0800
commita3ce57cca504022a8a6620d4b27ddbfe5a7222f4 (patch)
tree80a621a2deeeccbe0965918a284c6358a6e6e9dc /java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
parent613d4766d1bf14d250d2f8270843c06899981b9b (diff)
parentb092aef4a7034f5a4a50f0e50bf3b4ebb4e2a86c (diff)
downloadlatinime-a3ce57cca504022a8a6620d4b27ddbfe5a7222f4.tar.gz
latinime-a3ce57cca504022a8a6620d4b27ddbfe5a7222f4.tar.xz
latinime-a3ce57cca504022a8a6620d4b27ddbfe5a7222f4.zip
am b092aef4: Merge "Remove key show up and dismiss animation"
* commit 'b092aef4a7034f5a4a50f0e50bf3b4ebb4e2a86c': Remove key show up and dismiss animation
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsFragment.java')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SettingsFragment.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
index 67017a43b..bb5547fc9 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
@@ -169,6 +169,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
removePreference(Settings.PREF_VIBRATION_DURATION_SETTINGS, advancedSettings);
}
+ // TODO: consolidate key preview dismiss delay with the key preview animation parameters.
if (!Settings.readFromBuildConfigIfToShowKeyPreviewPopupOption(res)) {
removePreference(Settings.PREF_POPUP_ON, generalSettings);
removePreference(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY, advancedSettings);