nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 0325360d to master 

Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755
main
Tadashi G. Takaoka 2010-09-29 13:51:06 +09:00
parent 819e05f5fe 0325360d32
commit f48637a5b2
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/layout/keyboard_popup.xml
View File

@ -36,6 +36,6 @@
latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup" latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"
latin:keyHysteresisDistance="0dip" latin:keyHysteresisDistance="0dip"
latin:verticalCorrection="-20dip" latin:verticalCorrection="@dimen/mini_keyboard_vertical_correction"
/> />
</LinearLayout> </LinearLayout>

4
java/res/values-land/dimens.xml
View File

@ -24,6 +24,8 @@
<dimen name="candidate_strip_fading_edge_length">63dip</dimen> <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<dimen name="spacebar_vertical_correction">2dip</dimen> <dimen name="spacebar_vertical_correction">2dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- key_height * 1.7 --> <!-- key_height x 1.7 -->
<dimen name="mini_keyboard_slide_allowance">79.9dip</dimen> <dimen name="mini_keyboard_slide_allowance">79.9dip</dimen>
<!-- -key_height x 1.0 -->
<dimen name="mini_keyboard_vertical_correction">-47dip</dimen>
</resources> </resources>

6
java/res/values-xlarge/dimens.xml
View File

@ -24,7 +24,11 @@
<dimen name="spacebar_vertical_correction">0dip</dimen> <dimen name="spacebar_vertical_correction">0dip</dimen>
<dimen name="key_text_size">28sp</dimen> <dimen name="key_text_size">28sp</dimen>
<dimen name="key_label_text_size">16sp</dimen> <dimen name="key_label_text_size">16sp</dimen>
<dimen name="key_preview_offset">0dip</dimen>
<dimen name="key_preview_height">40dip</dimen> <dimen name="key_preview_height">40dip</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">122.4dip</dimen>
<!-- -key_height x 1.0 -->
<dimen name="mini_keyboard_vertical_correction">-72dip</dimen>
<dimen name="keyboard_vertical_correction">0dip</dimen> <dimen name="keyboard_vertical_correction">0dip</dimen>
</resources> </resources>

4
java/res/values/dimens.xml
View File

@ -32,8 +32,10 @@
<dimen name="key_preview_offset">0dip</dimen> <dimen name="key_preview_offset">0dip</dimen>
<dimen name="key_preview_height">80dip</dimen> <dimen name="key_preview_height">80dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- key_height * 1.7 --> <!-- key_height x 1.7 -->
<dimen name="mini_keyboard_slide_allowance">91.8dip</dimen> <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> <dimen name="key_hysteresis_distance">0.05in</dimen>
<dimen name="keyboard_vertical_correction">-10dip</dimen> <dimen name="keyboard_vertical_correction">-10dip</dimen>
</resources> </resources>