diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-01-26 00:49:20 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-01-26 00:49:20 +0900 |
| commit | b3861a41b50863791af7879baecea3a8a1a9a4f3 (patch) | |
| tree | c3123abf8354e54b5440e02244e8a432ac17f5ef /java/res | |
| parent | 071bf799c790543a1667d731e84d735c9093fbb3 (diff) | |
| parent | f73d2386dc63664a42fe90fe86c12742432f18d7 (diff) | |
| download | latinime-b3861a41b50863791af7879baecea3a8a1a9a4f3.tar.gz latinime-b3861a41b50863791af7879baecea3a8a1a9a4f3.tar.xz latinime-b3861a41b50863791af7879baecea3a8a1a9a4f3.zip | |
resolved conflicts for merge of f73d2386 to master
Change-Id: I3f7d3cf35e5df888e397e61acc9786972a1fda4c
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-xlarge/dimens.xml | 1 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml index 11ad6b184..69283202e 100644 --- a/java/res/values-xlarge/dimens.xml +++ b/java/res/values-xlarge/dimens.xml @@ -42,7 +42,6 @@ <dimen name="key_preview_text_size_large">24dip</dimen> <!-- left or right padding of label alignment --> <dimen name="key_label_horizontal_alignment_padding">6dip</dimen> - <dimen name="keyboard_bottom_row_vertical_correction">10.0mm</dimen> <dimen name="candidate_strip_height">46dip</dimen> <dimen name="candidate_strip_padding">15.0mm</dimen> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 90bf1bfad..7f00cdba3 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -46,7 +46,6 @@ <!-- We use "inch", not "dip" because this value tries dealing with physical distance related to user's finger. --> <dimen name="keyboard_vertical_correction">-0.05in</dimen> - <dimen name="keyboard_bottom_row_vertical_correction">0.0mm</dimen> <dimen name="candidate_strip_height">42dip</dimen> <dimen name="candidate_strip_fading_edge_length">63dip</dimen> |