Merge "Use resource to specify 5-rows keyboard parameters" into jb-mr1-dev

main
Tadashi G. Takaoka 2012-08-31 04:06:35 -07:00 committed by Android (Google) Code Review
commit 67d0a597bc
16 changed files with 53 additions and 23 deletions

View File

@ -53,9 +53,12 @@
<fraction name="key_uppercase_letter_ratio">40%</fraction>
<fraction name="key_preview_text_ratio">90%</fraction>
<fraction name="spacebar_text_ratio">40.000%</fraction>
<dimen name="key_preview_offset">0.0dp</dimen>
<!-- For 5-rows keyboard -->
<fraction name="key_bottom_gap_5rows">3.20%p</fraction>
<fraction name="key_letter_ratio_5rows">78%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">48%</fraction>
<dimen name="key_preview_offset">0.0dp</dimen>
<dimen name="key_preview_offset_ics">1.6dp</dimen>
<!-- popup_key_height x -0.5 -->

View File

@ -51,9 +51,12 @@
<fraction name="key_hint_label_ratio">34%</fraction>
<fraction name="key_uppercase_letter_ratio">29%</fraction>
<fraction name="spacebar_text_ratio">30.0%</fraction>
<dimen name="key_uppercase_letter_padding">4dp</dimen>
<!-- For 50rows keyboard -->
<fraction name="key_bottom_gap_5rows">3.20%p</fraction>
<fraction name="key_letter_ratio_5rows">62%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">36%</fraction>
<dimen name="key_uppercase_letter_padding">4dp</dimen>
<dimen name="suggestions_strip_padding">252.0dp</dimen>
<integer name="max_more_suggestions_row">5</integer>

View File

@ -63,11 +63,14 @@
<fraction name="key_uppercase_letter_ratio">22%</fraction>
<fraction name="key_preview_text_ratio">50%</fraction>
<fraction name="spacebar_text_ratio">28.0%</fraction>
<fraction name="key_letter_ratio_5rows">52%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">27%</fraction>
<dimen name="key_preview_height">94.5dp</dimen>
<dimen name="key_preview_offset">16.0dp</dimen>
<!-- For 50rows keyboard -->
<fraction name="key_bottom_gap_5rows">3.20%p</fraction>
<fraction name="key_letter_ratio_5rows">52%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">27%</fraction>
<dimen name="key_preview_offset_ics">8.0dp</dimen>
<!-- popup_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_ics">-31.5dp</dimen>

View File

@ -53,9 +53,12 @@
<fraction name="key_hint_label_ratio">28%</fraction>
<fraction name="key_uppercase_letter_ratio">24%</fraction>
<fraction name="spacebar_text_ratio">24.00%</fraction>
<dimen name="key_preview_height">107.1dp</dimen>
<!-- For 5-rows keyboard -->
<fraction name="key_bottom_gap_5rows">2.65%p</fraction>
<fraction name="key_letter_ratio_5rows">53%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">30%</fraction>
<dimen name="key_preview_height">107.1dp</dimen>
<dimen name="key_preview_offset_ics">8.0dp</dimen>

View File

@ -64,11 +64,14 @@
<fraction name="key_uppercase_letter_ratio">26%</fraction>
<fraction name="key_preview_text_ratio">50%</fraction>
<fraction name="spacebar_text_ratio">29.03%</fraction>
<fraction name="key_letter_ratio_5rows">51%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">33%</fraction>
<dimen name="key_preview_height">94.5dp</dimen>
<dimen name="key_preview_offset">16.0dp</dimen>
<!-- For 5-rows keyboard -->
<fraction name="key_bottom_gap_5rows">2.95%p</fraction>
<fraction name="key_letter_ratio_5rows">51%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">33%</fraction>
<dimen name="key_preview_offset_ics">8.0dp</dimen>
<!-- popup_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_ics">-31.5dp</dimen>

View File

@ -65,8 +65,6 @@
<fraction name="key_uppercase_letter_ratio">35%</fraction>
<fraction name="key_preview_text_ratio">82%</fraction>
<fraction name="spacebar_text_ratio">33.735%</fraction>
<fraction name="key_letter_ratio_5rows">64%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">41%</fraction>
<dimen name="key_preview_height">80dp</dimen>
<dimen name="key_preview_offset">-8.0dp</dimen>
@ -75,6 +73,11 @@
<dimen name="key_popup_hint_letter_padding">2dp</dimen>
<dimen name="key_uppercase_letter_padding">2dp</dimen>
<!-- For 5-rows keyboard -->
<fraction name="key_bottom_gap_5rows">3.20%p</fraction>
<fraction name="key_letter_ratio_5rows">64%</fraction>
<fraction name="key_uppercase_letter_ratio_5rows">41%</fraction>
<dimen name="key_preview_offset_ics">8.0dp</dimen>
<!-- popup_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_ics">-26.4dp</dimen>

View File

@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="3.20%p"
latin:keyTypeface="normal"
latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"

View File

@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="3.20%p"
latin:keyTypeface="normal"
latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"

View File

@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="2.65%p"
latin:keyTypeface="normal"
latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"

View File

@ -21,7 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="2.65%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"
>
<include

View File

@ -21,7 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="2.65%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"
>
<include

View File

@ -20,9 +20,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="2.95%p"
latin:keyTypeface="normal"
latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"

View File

@ -21,7 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="2.95%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"
>
<include

View File

@ -21,7 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="2.95%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"
>
<include

View File

@ -21,7 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="3.20%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"
>
<include

View File

@ -21,7 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
latin:verticalGap="3.20%p"
latin:verticalGap="@fraction/key_bottom_gap_5rows"
latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
latin:touchPositionCorrectionData="@null"
>
<include