am abb42d8b: am 1093952c: Merge "ResearchLogging do not even show basic data for password fields" into jb-mr1-dev

* commit 'abb42d8bd54667c8c178f206ab9a6ec54753e520':
  ResearchLogging do not even show basic data for password fields
This commit is contained in:
Kurt Partridge 2012-09-05 11:57:42 -07:00 committed by Android Git Automerger
commit 3f189e18fc

View file

@ -1018,26 +1018,26 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
final boolean isPasswordView = kid.passwordInput(); final boolean isPasswordView = kid.passwordInput();
getInstance().setIsPasswordView(isPasswordView); getInstance().setIsPasswordView(isPasswordView);
final Object[] values = { final Object[] values = {
KeyboardId.elementIdToName(kid.mElementId), KeyboardId.elementIdToName(kid.mElementId),
kid.mLocale + ":" + kid.mSubtype.getExtraValueOf(KEYBOARD_LAYOUT_SET), kid.mLocale + ":" + kid.mSubtype.getExtraValueOf(KEYBOARD_LAYOUT_SET),
kid.mOrientation, kid.mOrientation,
kid.mWidth, kid.mWidth,
KeyboardId.modeName(kid.mMode), KeyboardId.modeName(kid.mMode),
kid.imeAction(), kid.imeAction(),
kid.navigateNext(), kid.navigateNext(),
kid.navigatePrevious(), kid.navigatePrevious(),
kid.mClobberSettingsKey, kid.mClobberSettingsKey,
isPasswordView, isPasswordView,
kid.mShortcutKeyEnabled, kid.mShortcutKeyEnabled,
kid.mHasShortcutKey, kid.mHasShortcutKey,
kid.mLanguageSwitchKeyEnabled, kid.mLanguageSwitchKeyEnabled,
kid.isMultiLine(), kid.isMultiLine(),
keyboard.mOccupiedWidth, keyboard.mOccupiedWidth,
keyboard.mOccupiedHeight, keyboard.mOccupiedHeight,
keyboard.mKeys keyboard.mKeys
}; };
getInstance().enqueueEvent(EVENTKEYS_MAINKEYBOARDVIEW_SETKEYBOARD, values);
getInstance().setIsPasswordView(isPasswordView); getInstance().setIsPasswordView(isPasswordView);
getInstance().enqueueEvent(EVENTKEYS_MAINKEYBOARDVIEW_SETKEYBOARD, values);
} }
} }