Skip to content
Snippets Groups Projects
Commit cd7b7d3e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Specify keyboard metrics with physical unit "inch"

Cherrypick I44f3b2eef8086d6e0b0db53d38f08487549060c6 from Gingerbread

This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107
Change-Id: Ib38355ebfc2f8d5b1d26c4e90eba87196fbeddfa
parent 65100ff3
No related branches found
No related tags found
No related merge requests found
Showing
with 51 additions and 29 deletions
java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png

521 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png

511 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png

783 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png

760 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png

1.09 KiB | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png

1.06 KiB | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png

747 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png

730 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png

962 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png

940 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png

1.25 KiB | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png

1.23 KiB | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png

481 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png

461 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png

1.6 KiB | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png

811 B | W: | H:

java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png

385 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png

377 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png

550 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png

545 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png

813 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png

806 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png

518 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png

514 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png

700 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png

687 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png

950 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png

940 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png
java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png

358 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png

355 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png
java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png
java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png
java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png
  • 2-up
  • Swipe
  • Onion skin
java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png

530 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png

526 B | W: | H:

java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png
java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png
java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png
java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/keyboard_bottom_padding"
android:background="@drawable/keyboard_dark_background" android:background="@drawable/keyboard_dark_background"
android:textStyle="bold" android:textStyle="bold"
......
...@@ -19,13 +19,17 @@ ...@@ -19,13 +19,17 @@
--> -->
<resources> <resources>
<dimen name="key_height">47dip</dimen> <!-- key_height + key_bottom_gap = popup_key_height -->
<dimen name="key_height">0.250in</dimen>
<dimen name="key_bottom_gap">0.020in</dimen>
<dimen name="popup_key_height">0.270in</dimen>
<dimen name="keyboard_bottom_padding">0.0in</dimen>
<dimen name="candidate_strip_height">38dip</dimen> <dimen name="candidate_strip_height">38dip</dimen>
<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 x 1.7 --> <!-- popup_key_height x 1.7 -->
<dimen name="mini_keyboard_slide_allowance">79.9dip</dimen> <dimen name="mini_keyboard_slide_allowance">0.459in</dimen>
<!-- -key_height x 1.0 --> <!-- popup_key_height x 1.0 -->
<dimen name="mini_keyboard_vertical_correction">-47dip</dimen> <dimen name="mini_keyboard_vertical_correction">-0.270in</dimen>
</resources> </resources>
...@@ -19,18 +19,26 @@ ...@@ -19,18 +19,26 @@
--> -->
<resources> <resources>
<dimen name="key_height">72dip</dimen> <!-- key_height + key_bottom_gap = popup_key_height -->
<dimen name="candidate_strip_height">46dip</dimen> <dimen name="key_height">0.450in</dimen>
<dimen name="spacebar_vertical_correction">0dip</dimen> <dimen name="key_bottom_gap">0.0in</dimen>
<dimen name="key_text_size">28sp</dimen> <dimen name="popup_key_height">0.450in</dimen>
<dimen name="key_label_text_size">16sp</dimen> <dimen name="keyboard_bottom_padding">0.10in</dimen>
<dimen name="key_preview_height">40dip</dimen> <!-- key_height x 1.6 -->
<dimen name="key_preview_height">0.720in</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 x 1.7 --> <!-- popup_key_height x 1.7 -->
<dimen name="mini_keyboard_slide_allowance">122.4dip</dimen> <dimen name="mini_keyboard_slide_allowance">0.765in</dimen>
<!-- -key_height x 1.0 --> <!-- popup_key_height x 1.0 -->
<dimen name="mini_keyboard_vertical_correction">-72dip</dimen> <dimen name="mini_keyboard_vertical_correction">-0.450in</dimen>
<dimen name="key_text_size">0.175in</dimen>
<dimen name="key_label_text_size">0.100in</dimen>
<dimen name="key_preview_text_size_large">0.245in</dimen>
<!-- We use "inch", not "dip" because this value tries dealing with physical distance related <!-- We use "inch", not "dip" because this value tries dealing with physical distance related
to user's finger. --> to user's finger. -->
<dimen name="keyboard_vertical_correction">0.0in</dimen> <dimen name="keyboard_vertical_correction">0.0in</dimen>
<dimen name="candidate_strip_height">46dip</dimen>
<dimen name="spacebar_vertical_correction">0dip</dimen>
</resources> </resources>
...@@ -19,26 +19,35 @@ ...@@ -19,26 +19,35 @@
--> -->
<resources> <resources>
<dimen name="key_height">54dip</dimen> <!-- key_height + key_bottom_gap = popup_key_height -->
<dimen name="bubble_pointer_offset">22dip</dimen> <dimen name="key_height">0.290in</dimen>
<dimen name="key_bottom_gap">0.035in</dimen>
<dimen name="popup_key_height">0.325in</dimen>
<dimen name="keyboard_bottom_padding">0.06in</dimen>
<!-- key_height x 1.6 -->
<dimen name="key_preview_height">0.464in</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.7 -->
<dimen name="mini_keyboard_slide_allowance">0.553in</dimen>
<!-- popup_key_height x 1.0 -->
<dimen name="mini_keyboard_vertical_correction">-0.325in</dimen>
<dimen name="key_text_size">0.13in</dimen>
<dimen name="key_label_text_size">0.083in</dimen>
<dimen name="key_preview_text_size_large">0.236in</dimen>
<dimen name="key_preview_offset">0.000in</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.05in</dimen>
<dimen name="candidate_strip_height">42dip</dimen> <dimen name="candidate_strip_height">42dip</dimen>
<dimen name="candidate_strip_fading_edge_length">63dip</dimen> <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<dimen name="spacebar_vertical_correction">4dip</dimen> <dimen name="spacebar_vertical_correction">4dip</dimen>
<!-- If the screen height in landscape is larger than the below value, then the keyboard <!-- If the screen height in landscape is larger than the below value, then the keyboard
will not go into extract (fullscreen) mode. --> will not go into extract (fullscreen) mode. -->
<dimen name="max_height_for_fullscreen">2.5in</dimen> <dimen name="max_height_for_fullscreen">2.5in</dimen>
<dimen name="key_text_size">22sp</dimen> <dimen name="bubble_pointer_offset">22dip</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> <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> <dimen name="candidate_min_touchable_width">0.3in</dimen>
</resources> </resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment