diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-10-08 03:26:00 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 03:26:00 -0700 |
| commit | 491bb105ff07568a6bc4335b6c83de108086ec87 (patch) | |
| tree | a5a88ca7d8f7786ee060521830cb437e11804772 /java | |
| parent | 23d50bfb13b5def0bc226122baed15ddcace42f6 (diff) | |
| parent | cb0046288d58648dbc2a3100e4e8aa483a62a353 (diff) | |
| download | latinime-491bb105ff07568a6bc4335b6c83de108086ec87.tar.gz latinime-491bb105ff07568a6bc4335b6c83de108086ec87.tar.xz latinime-491bb105ff07568a6bc4335b6c83de108086ec87.zip | |
am cb004628: Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread
Merge commit 'cb0046288d58648dbc2a3100e4e8aa483a62a353' into gingerbread-plus-aosp
* commit 'cb0046288d58648dbc2a3100e4e8aa483a62a353':
Make keyboard vertical correction configurable (DO NOT MERGE)
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index f83fc36a6..1378be72c 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -28,10 +28,17 @@ will not go into extract (fullscreen) mode. --> <dimen name="max_height_for_fullscreen">2.5in</dimen> <dimen name="key_text_size">22sp</dimen> + <dimen name="key_label_text_size">14sp</dimen> + <dimen name="key_preview_offset">0dip</dimen> + <dimen name="key_preview_height">80dip</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- key_height x 1.7 --> <dimen name="mini_keyboard_slide_allowance">91.8dip</dimen> <!-- -key_height x 1.0 --> <dimen name="mini_keyboard_vertical_correction">-54dip</dimen> + <dimen name="key_hysteresis_distance">0.05in</dimen> + <!-- We use "inch", not "dip" because this value tries dealing with physical distance related + to user's finger. --> + <dimen name="keyboard_vertical_correction">-0.06in</dimen> <dimen name="candidate_min_touchable_width">0.3in</dimen> </resources> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 5e239482f..0372b07cf 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -22,12 +22,12 @@ <item name="keyTextSize">@dimen/key_text_size</item> <item name="keyTextColor">#FFFFFFFF</item> <item name="keyPreviewLayout">@layout/key_preview</item> - <item name="keyPreviewOffset">0dip</item> - <item name="keyPreviewHeight">80dip</item> - <item name="labelTextSize">14sp</item> + <item name="keyPreviewOffset">@dimen/key_preview_offset</item> + <item name="keyPreviewHeight">@dimen/key_preview_height</item> + <item name="labelTextSize">@dimen/key_label_text_size</item> <item name="popupLayout">@layout/keyboard_popup</item> - <item name="keyHysteresisDistance">0.05in</item> - <item name="verticalCorrection">-10dip</item> + <item name="keyHysteresisDistance">@dimen/key_hysteresis_distance</item> + <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item> <item name="shadowColor">#BB000000</item> <item name="shadowRadius">2.75</item> <item name="backgroundDimAmount">0.5</item> |