diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-01-29 01:36:23 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-01-29 01:36:23 -0800 |
| commit | c6be8b5d8deb24397c7d98cfb417fe58fbef163f (patch) | |
| tree | e5eacfcad9eb1e1bf4491375bd074e9d406e9826 /java/res | |
| parent | b6b7a37973363945ff107fd51212ca3bf52a7c04 (diff) | |
| parent | 83f173cccd4cd6be0a9ab56ac2d199625ec03525 (diff) | |
| download | latinime-c6be8b5d8deb24397c7d98cfb417fe58fbef163f.tar.gz latinime-c6be8b5d8deb24397c7d98cfb417fe58fbef163f.tar.xz latinime-c6be8b5d8deb24397c7d98cfb417fe58fbef163f.zip | |
am 83f173cc: Merge "Remove {max,min}keyboardHeight attribute from Keyboard"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1)
* commit '83f173cccd4cd6be0a9ab56ac2d199625ec03525':
Remove {max,min}keyboardHeight attribute from Keyboard
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 7 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 51a0758e6..5b3898709 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -173,13 +173,6 @@ <attr name="themeId" format="integer" /> <!-- Touch position correction --> <attr name="touchPositionCorrectionData" format="reference" /> - <!-- Default keyboard height --> - <attr name="keyboardHeight" format="dimension|fraction" /> - <!-- Maximum keyboard height, in pixels or percentage of display height --> - <attr name="maxKeyboardHeight" format="dimension|fraction" /> - <!-- Minimum keyboard height represented in pixels, percentage of display height if fraction - is positive, or percentage of display width if fraction is negative. --> - <attr name="minKeyboardHeight" format="dimension|fraction" /> <!-- Keyboard top, bottom, both horizontal edges paddings. --> <attr name="keyboardTopPadding" format="dimension|fraction" /> <attr name="keyboardBottomPadding" format="dimension|fraction" /> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index f07f2d352..19d6da86e 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -21,9 +21,6 @@ <item name="themeId">0</item> <item name="touchPositionCorrectionData">@array/touch_position_correction_data_default</item> <item name="rowHeight">25%p</item> - <item name="keyboardHeight">@dimen/keyboardHeight</item> - <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item> - <item name="minKeyboardHeight">@fraction/minKeyboardHeight</item> <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item> <item name="keyboardTopPadding">@fraction/keyboard_top_padding</item> <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item> |