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

Merge "Convert dimension unit "in" and "mm" to "dp""

main
Tadashi G. Takaoka 2012-03-25 20:21:00 -07:00 committed by Android (Google) Code Review
parent ef6034e7da 2a04637f60
commit 99eb2d3404
8 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,7 @@
<dimen name="keyboardHeight">176.0dp</dimen> <dimen name="keyboardHeight">176.0dp</dimen>
<fraction name="minKeyboardHeight">45%p</fraction> <fraction name="minKeyboardHeight">45%p</fraction>
<!-- key_height + key_bottom_gap = popup_key_height --> <!-- key_height + key_bottom_gap = popup_key_height -->
<!-- <dimen name="key_height">0.260in</dimen>--> <dimen name="popup_key_height">44.8dp</dimen>
<dimen name="popup_key_height">0.280in</dimen>
<fraction name="keyboard_top_padding">1.818%p</fraction> <fraction name="keyboard_top_padding">1.818%p</fraction>
<fraction name="keyboard_bottom_padding">0.0%p</fraction> <fraction name="keyboard_bottom_padding">0.0%p</fraction>
@ -54,11 +53,11 @@
<fraction name="key_uppercase_letter_ratio">40%</fraction> <fraction name="key_uppercase_letter_ratio">40%</fraction>
<fraction name="key_preview_text_ratio">90%</fraction> <fraction name="key_preview_text_ratio">90%</fraction>
<fraction name="spacebar_text_ratio">40.000%</fraction> <fraction name="spacebar_text_ratio">40.000%</fraction>
<dimen name="key_preview_offset">0.08in</dimen> <dimen name="key_preview_offset">12.8dp</dimen>
<dimen name="key_preview_offset_ics">0.01in</dimen> <dimen name="key_preview_offset_ics">1.6dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- popup_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_ics">-0.140in</dimen> <dimen name="more_keys_keyboard_vertical_correction_ics">-22.4dp</dimen>
<dimen name="suggestions_strip_height">36dp</dimen> <dimen name="suggestions_strip_height">36dp</dimen>
<dimen name="more_suggestions_row_height">36dp</dimen> <dimen name="more_suggestions_row_height">36dp</dimen>
@ -66,7 +65,7 @@
<fraction name="min_more_suggestions_width">60%</fraction> <fraction name="min_more_suggestions_width">60%</fraction>
<!-- 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. -->
<!-- popup_key_height x 1.2 --> <!-- popup_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">0.336in</dimen> <dimen name="more_keys_keyboard_slide_allowance">53.76dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- popup_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction">-0.280in</dimen> <dimen name="more_keys_keyboard_vertical_correction">-44.8dp</dimen>
</resources> </resources>

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

@ -38,7 +38,7 @@
<fraction name="key_bottom_gap_ics">4.0%p</fraction> <fraction name="key_bottom_gap_ics">4.0%p</fraction>
<fraction name="keyboard_bottom_padding_ics">0.0%p</fraction> <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction>
<dimen name="popup_key_height">13.0mm</dimen> <dimen name="popup_key_height">81.9dp</dimen>
<!-- left or right padding of label alignment --> <!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_padding">18dp</dimen> <dimen name="key_label_horizontal_padding">18dp</dimen>
@ -51,7 +51,7 @@
<fraction name="key_uppercase_letter_ratio">29%</fraction> <fraction name="key_uppercase_letter_ratio">29%</fraction>
<fraction name="spacebar_text_ratio">33.33%</fraction> <fraction name="spacebar_text_ratio">33.33%</fraction>
<dimen name="suggestions_strip_padding">40.0mm</dimen> <dimen name="suggestions_strip_padding">252.0dp</dimen>
<integer name="max_more_suggestions_row">5</integer> <integer name="max_more_suggestions_row">5</integer>
<fraction name="min_more_suggestions_width">50%</fraction> <fraction name="min_more_suggestions_width">50%</fraction>
</resources> </resources>

18
java/res/values-sw600dp/dimens.xml
View File

@ -25,7 +25,7 @@
<fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="maxKeyboardHeight">50%p</fraction>
<fraction name="minKeyboardHeight">-35.0%p</fraction> <fraction name="minKeyboardHeight">-35.0%p</fraction>
<dimen name="popup_key_height">10.0mm</dimen> <dimen name="popup_key_height">63.0dp</dimen>
<fraction name="keyboard_top_padding">2.291%p</fraction> <fraction name="keyboard_top_padding">2.291%p</fraction>
<fraction name="keyboard_bottom_padding">0.0%p</fraction> <fraction name="keyboard_bottom_padding">0.0%p</fraction>
@ -44,9 +44,9 @@
<dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen> <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</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. -->
<!-- popup_key_height x 1.2 --> <!-- popup_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen> <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- popup_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen> <dimen name="more_keys_keyboard_vertical_correction">-81.9dp</dimen>
<!-- left or right padding of label alignment --> <!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_padding">6dp</dimen> <dimen name="key_label_horizontal_padding">6dp</dimen>
@ -61,19 +61,19 @@
<fraction name="key_uppercase_letter_ratio">26%</fraction> <fraction name="key_uppercase_letter_ratio">26%</fraction>
<fraction name="key_preview_text_ratio">50%</fraction> <fraction name="key_preview_text_ratio">50%</fraction>
<fraction name="spacebar_text_ratio">32.14%</fraction> <fraction name="spacebar_text_ratio">32.14%</fraction>
<dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_height">94.5dp</dimen>
<dimen name="key_preview_offset">0.1in</dimen> <dimen name="key_preview_offset">16.0dp</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="key_preview_offset_ics">8.0dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- popup_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> <dimen name="more_keys_keyboard_vertical_correction_ics">-31.5dp</dimen>
<dimen name="suggestions_strip_height">44dp</dimen> <dimen name="suggestions_strip_height">44dp</dimen>
<dimen name="more_suggestions_row_height">44dp</dimen> <dimen name="more_suggestions_row_height">44dp</dimen>
<integer name="max_more_suggestions_row">6</integer> <integer name="max_more_suggestions_row">6</integer>
<fraction name="min_more_suggestions_width">90%</fraction> <fraction name="min_more_suggestions_width">90%</fraction>
<dimen name="suggestions_strip_padding">15.0mm</dimen> <dimen name="suggestions_strip_padding">94.5dp</dimen>
<dimen name="suggestion_min_width">0.3in</dimen> <dimen name="suggestion_min_width">48.0dp</dimen>
<dimen name="suggestion_padding">12dp</dimen> <dimen name="suggestion_padding">12dp</dimen>
<dimen name="suggestion_text_size">22dp</dimen> <dimen name="suggestion_text_size">22dp</dimen>
<dimen name="more_suggestions_hint_text_size">33dp</dimen> <dimen name="more_suggestions_hint_text_size">33dp</dimen>

8
java/res/values-sw768dp-land/dimens.xml
View File

@ -41,7 +41,7 @@
<fraction name="key_bottom_gap_ics">3.690%p</fraction> <fraction name="key_bottom_gap_ics">3.690%p</fraction>
<fraction name="key_horizontal_gap_ics">1.030%p</fraction> <fraction name="key_horizontal_gap_ics">1.030%p</fraction>
<dimen name="popup_key_height">13.0mm</dimen> <dimen name="popup_key_height">81.9dp</dimen>
<!-- left or right padding of label alignment --> <!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_padding">18dp</dimen> <dimen name="key_label_horizontal_padding">18dp</dimen>
@ -53,10 +53,10 @@
<fraction name="key_hint_label_ratio">28%</fraction> <fraction name="key_hint_label_ratio">28%</fraction>
<fraction name="key_uppercase_letter_ratio">24%</fraction> <fraction name="key_uppercase_letter_ratio">24%</fraction>
<fraction name="spacebar_text_ratio">24.00%</fraction> <fraction name="spacebar_text_ratio">24.00%</fraction>
<dimen name="key_preview_height">17.0mm</dimen> <dimen name="key_preview_height">107.1dp</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="key_preview_offset_ics">8.0dp</dimen>
<dimen name="suggestions_strip_padding">40.0mm</dimen> <dimen name="suggestions_strip_padding">252.0dp</dimen>
<fraction name="min_more_suggestions_width">50%</fraction> <fraction name="min_more_suggestions_width">50%</fraction>
</resources> </resources>

16
java/res/values-sw768dp/dimens.xml
View File

@ -41,14 +41,14 @@
<fraction name="key_bottom_gap_ics">3.312%p</fraction> <fraction name="key_bottom_gap_ics">3.312%p</fraction>
<fraction name="key_horizontal_gap_ics">1.066%p</fraction> <fraction name="key_horizontal_gap_ics">1.066%p</fraction>
<dimen name="popup_key_height">10.0mm</dimen> <dimen name="popup_key_height">63.0dp</dimen>
<dimen name="more_keys_keyboard_key_horizontal_padding">12dp</dimen> <dimen name="more_keys_keyboard_key_horizontal_padding">12dp</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. -->
<!-- popup_key_height x 1.2 --> <!-- popup_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">15.6mm</dimen> <dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- popup_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction">-13.0mm</dimen> <dimen name="more_keys_keyboard_vertical_correction">-81.9dp</dimen>
<!-- left or right padding of label alignment --> <!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_padding">6dp</dimen> <dimen name="key_label_horizontal_padding">6dp</dimen>
@ -63,18 +63,18 @@
<fraction name="key_uppercase_letter_ratio">26%</fraction> <fraction name="key_uppercase_letter_ratio">26%</fraction>
<fraction name="key_preview_text_ratio">50%</fraction> <fraction name="key_preview_text_ratio">50%</fraction>
<fraction name="spacebar_text_ratio">29.03%</fraction> <fraction name="spacebar_text_ratio">29.03%</fraction>
<dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_height">94.5dp</dimen>
<dimen name="key_preview_offset">0.1in</dimen> <dimen name="key_preview_offset">16.0dp</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="key_preview_offset_ics">8.0dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- popup_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> <dimen name="more_keys_keyboard_vertical_correction_ics">-31.5dp</dimen>
<dimen name="suggestions_strip_height">44dp</dimen> <dimen name="suggestions_strip_height">44dp</dimen>
<dimen name="more_suggestions_row_height">44dp</dimen> <dimen name="more_suggestions_row_height">44dp</dimen>
<integer name="max_more_suggestions_row">6</integer> <integer name="max_more_suggestions_row">6</integer>
<fraction name="min_more_suggestions_width">90%</fraction> <fraction name="min_more_suggestions_width">90%</fraction>
<dimen name="suggestions_strip_padding">15.0mm</dimen> <dimen name="suggestions_strip_padding">94.5dp</dimen>
<dimen name="suggestion_min_width">46dp</dimen> <dimen name="suggestion_min_width">46dp</dimen>
<dimen name="suggestion_padding">8dp</dimen> <dimen name="suggestion_padding">8dp</dimen>
<dimen name="suggestion_text_size">22dp</dimen> <dimen name="suggestion_text_size">22dp</dimen>

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

@ -54,9 +54,9 @@
<!-- <!--
Configuration for LatinKeyboardView Configuration for LatinKeyboardView
--> -->
<dimen name="config_key_hysteresis_distance">0.05in</dimen> <dimen name="config_key_hysteresis_distance">8.0dp</dimen>
<integer name="config_touch_noise_threshold_time">40</integer> <integer name="config_touch_noise_threshold_time">40</integer>
<dimen name="config_touch_noise_threshold_distance">2.0mm</dimen> <dimen name="config_touch_noise_threshold_distance">12.6dp</dimen>
<bool name="config_sliding_key_input_enabled">true</bool> <bool name="config_sliding_key_input_enabled">true</bool>
<integer name="config_key_repeat_start_timeout">400</integer> <integer name="config_key_repeat_start_timeout">400</integer>
<integer name="config_key_repeat_interval">50</integer> <integer name="config_key_repeat_interval">50</integer>

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

@ -25,7 +25,7 @@
<fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="maxKeyboardHeight">50%p</fraction>
<fraction name="minKeyboardHeight">-61.8%p</fraction> <fraction name="minKeyboardHeight">-61.8%p</fraction>
<dimen name="popup_key_height">0.330in</dimen> <dimen name="popup_key_height">52.8dp</dimen>
<dimen name="more_keys_keyboard_horizontal_edges_padding">16dp</dimen> <dimen name="more_keys_keyboard_horizontal_edges_padding">16dp</dimen>
<dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen> <dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen>
@ -52,12 +52,10 @@
<!-- 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. -->
<!-- popup_key_height x 1.2 --> <!-- popup_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">0.396in</dimen> <dimen name="more_keys_keyboard_slide_allowance">63.36dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- popup_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction">-0.330in</dimen> <dimen name="more_keys_keyboard_vertical_correction">-52.8dp</dimen>
<!-- We use "inch", not "dip" because this value tries dealing with physical distance related <dimen name="keyboard_vertical_correction">0.0dp</dimen>
to user's finger. -->
<dimen name="keyboard_vertical_correction">0.0in</dimen>
<fraction name="key_letter_ratio">55%</fraction> <fraction name="key_letter_ratio">55%</fraction>
<fraction name="key_large_letter_ratio">65%</fraction> <fraction name="key_large_letter_ratio">65%</fraction>
@ -68,23 +66,23 @@
<fraction name="key_preview_text_ratio">82%</fraction> <fraction name="key_preview_text_ratio">82%</fraction>
<fraction name="spacebar_text_ratio">33.735%</fraction> <fraction name="spacebar_text_ratio">33.735%</fraction>
<dimen name="key_preview_height">80dp</dimen> <dimen name="key_preview_height">80dp</dimen>
<dimen name="key_preview_offset">0.1in</dimen> <dimen name="key_preview_offset">16.0dp</dimen>
<dimen name="key_label_horizontal_padding">4dp</dimen> <dimen name="key_label_horizontal_padding">4dp</dimen>
<dimen name="key_hint_letter_padding">1dp</dimen> <dimen name="key_hint_letter_padding">1dp</dimen>
<dimen name="key_popup_hint_letter_padding">2dp</dimen> <dimen name="key_popup_hint_letter_padding">2dp</dimen>
<dimen name="key_uppercase_letter_padding">2dp</dimen> <dimen name="key_uppercase_letter_padding">2dp</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="key_preview_offset_ics">8.0dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- popup_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_ics">-0.165in</dimen> <dimen name="more_keys_keyboard_vertical_correction_ics">-26.4dp</dimen>
<dimen name="suggestions_strip_height">40dp</dimen> <dimen name="suggestions_strip_height">40dp</dimen>
<dimen name="more_suggestions_key_horizontal_padding">12dp</dimen> <dimen name="more_suggestions_key_horizontal_padding">12dp</dimen>
<dimen name="more_suggestions_row_height">40dp</dimen> <dimen name="more_suggestions_row_height">40dp</dimen>
<dimen name="more_suggestions_bottom_gap">6dp</dimen> <dimen name="more_suggestions_bottom_gap">6dp</dimen>
<dimen name="more_suggestions_modal_tolerance">0.2in</dimen> <dimen name="more_suggestions_modal_tolerance">32.0dp</dimen>
<dimen name="more_suggestions_slide_allowance">0.1in</dimen> <dimen name="more_suggestions_slide_allowance">16.0dp</dimen>
<integer name="max_more_suggestions_row">6</integer> <integer name="max_more_suggestions_row">6</integer>
<fraction name="min_more_suggestions_width">90%</fraction> <fraction name="min_more_suggestions_width">90%</fraction>
<fraction name="more_suggestions_info_ratio">18%</fraction> <fraction name="more_suggestions_info_ratio">18%</fraction>

2
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -394,7 +394,7 @@ public class Keyboard {
* &gt;Row row_attributes*&lt; * &gt;Row row_attributes*&lt;
* &gt;!-- Row Content --&lt; * &gt;!-- Row Content --&lt;
* &gt;Key key_attributes* /&lt; * &gt;Key key_attributes* /&lt;
* &gt;Spacer horizontalGap="0.2in" /&lt; * &gt;Spacer horizontalGap="32.0dp" /&lt;
* &gt;include keyboardLayout="@xml/other_keys"&lt; * &gt;include keyboardLayout="@xml/other_keys"&lt;
* ... * ...
* &gt;/Row&lt; * &gt;/Row&lt;