diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-07 00:54:05 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-07 00:54:05 -0700 |
| commit | 145ac75c0d099615fcb5ffa40eefd04d4f48e268 (patch) | |
| tree | a9884eb2cccfceb3940a4430093a838150b11dcb /java/src/com/android/inputmethod/research/ResearchLogger.java | |
| parent | 035a4bd679a57292de8e5f217aaa49c626b6fae7 (diff) | |
| parent | 7de0331a19bbe07a2689d7b49ae9a798a9451c2c (diff) | |
| download | latinime-145ac75c0d099615fcb5ffa40eefd04d4f48e268.tar.gz latinime-145ac75c0d099615fcb5ffa40eefd04d4f48e268.tar.xz latinime-145ac75c0d099615fcb5ffa40eefd04d4f48e268.zip | |
am 7de0331a: Merge "Remove orientation member from KeyboardId"
* commit '7de0331a19bbe07a2689d7b49ae9a798a9451c2c':
Remove orientation member from KeyboardId
Diffstat (limited to 'java/src/com/android/inputmethod/research/ResearchLogger.java')
| -rw-r--r-- | java/src/com/android/inputmethod/research/ResearchLogger.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java index 0bd493970..3a3408266 100644 --- a/java/src/com/android/inputmethod/research/ResearchLogger.java +++ b/java/src/com/android/inputmethod/research/ResearchLogger.java @@ -1414,7 +1414,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang "navigatePrevious", "clobberSettingsKey", "passwordInput", "shortcutKeyEnabled", "hasShortcutKey", "languageSwitchKeyEnabled", "isMultiLine", "tw", "th", "keys"); - public static void mainKeyboardView_setKeyboard(final Keyboard keyboard) { + public static void mainKeyboardView_setKeyboard(final Keyboard keyboard, + final int orientation) { final KeyboardId kid = keyboard.mId; final boolean isPasswordView = kid.passwordInput(); final ResearchLogger researchLogger = getInstance(); @@ -1422,7 +1423,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang researchLogger.enqueueEvent(LOGSTATEMENT_MAINKEYBOARDVIEW_SETKEYBOARD, KeyboardId.elementIdToName(kid.mElementId), kid.mLocale + ":" + kid.mSubtype.getExtraValueOf(KEYBOARD_LAYOUT_SET), - kid.mOrientation, kid.mWidth, KeyboardId.modeName(kid.mMode), kid.imeAction(), + orientation, kid.mWidth, KeyboardId.modeName(kid.mMode), kid.imeAction(), kid.navigateNext(), kid.navigatePrevious(), kid.mClobberSettingsKey, isPasswordView, kid.mShortcutKeyEnabled, kid.mHasShortcutKey, kid.mLanguageSwitchKeyEnabled, kid.isMultiLine(), keyboard.mOccupiedWidth, |