diff options
| author | Jon Dormody <jond@google.com> | 2018-01-29 19:52:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-29 19:52:56 +0000 |
| commit | 8ea40cf752732abe7a442e056c8a042d8820c6d2 (patch) | |
| tree | 9bca98e468e64b2ed9285dc2bb7b4006928e73e1 /core/java | |
| parent | 93c4aca119a6ca25a30014e586669f8d475bc24b (diff) | |
| parent | afb592c4bf25a7257de668d97f25806c41e92231 (diff) | |
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev am: 7b3c924114
am: afb592c4bf
Change-Id: I2276021c9c2ae453add4e139b677dcfe7e71facd
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/inputmethodservice/KeyboardView.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java index 13b9206b12ee..2306e5fa3dc1 100644 --- a/core/java/android/inputmethodservice/KeyboardView.java +++ b/core/java/android/inputmethodservice/KeyboardView.java @@ -61,6 +61,7 @@ import java.util.Map; * @attr ref android.R.styleable#KeyboardView_keyBackground * @attr ref android.R.styleable#KeyboardView_keyPreviewLayout * @attr ref android.R.styleable#KeyboardView_keyPreviewOffset + * @attr ref android.R.styleable#KeyboardView_keyPreviewHeight * @attr ref android.R.styleable#KeyboardView_labelTextSize * @attr ref android.R.styleable#KeyboardView_keyTextSize * @attr ref android.R.styleable#KeyboardView_keyTextColor |