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

Add config_ prefix to the resource names merged from dimens.xml 

Change-Id: I6fb11b8cb52c06b805fb17d61450d7df50e4e20d
main
Tadashi G. Takaoka 2013-12-02 18:38:03 +09:00
parent 5a9c78855a
commit 8c6052bce1
45 changed files with 462 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/suggestions_strip_height" android:layout_height="@dimen/config_suggestions_strip_height"
> >
<TabHost <TabHost
android:id="@+id/emoji_category_tabhost" android:id="@+id/emoji_category_tabhost"

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

@ -23,7 +23,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:textSize="@dimen/suggestion_text_size" android:textSize="@dimen/config_suggestion_text_size"
android:gravity="center" android:gravity="center"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingTop="0dp" android:paddingTop="0dp"

6
java/res/layout/input_view.xml
View File

@ -41,10 +41,10 @@
android:id="@+id/suggestion_strip_view" android:id="@+id/suggestion_strip_view"
android:layoutDirection="ltr" android:layoutDirection="ltr"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/suggestions_strip_height" android:layout_height="@dimen/config_suggestions_strip_height"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingRight="@dimen/suggestions_strip_padding" android:paddingRight="@dimen/config_suggestions_strip_horizontal_padding"
android:paddingLeft="@dimen/suggestions_strip_padding" android:paddingLeft="@dimen/config_suggestions_strip_horizontal_padding"
style="?attr/suggestionStripViewStyle" /> style="?attr/suggestionStripViewStyle" />
<!-- To ensure that key preview popup is correctly placed when the current system locale is <!-- To ensure that key preview popup is correctly placed when the current system locale is

6
java/res/layout/more_suggestions.xml
View File

@ -29,8 +29,8 @@
android:id="@+id/more_suggestions_view" android:id="@+id/more_suggestions_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
latin:keyLetterSize="@dimen/suggestion_text_size" latin:keyLetterSize="@dimen/config_suggestion_text_size"
latin:keyLabelSize="@dimen/suggestion_text_size" latin:keyLabelSize="@dimen/config_suggestion_text_size"
latin:keyHintLetterRatio="@fraction/more_suggestions_info_ratio" latin:keyHintLetterRatio="@fraction/config_more_suggestions_info_ratio"
latin:keyHintLetterColor="@android:color/white" /> latin:keyHintLetterColor="@android:color/white" />
</LinearLayout> </LinearLayout>

8
java/res/layout/suggestion_word.xml
View File

@ -24,12 +24,12 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="@dimen/suggestion_min_width" android:minWidth="@dimen/config_suggestion_min_width"
android:textSize="@dimen/suggestion_text_size" android:textSize="@dimen/config_suggestion_text_size"
android:gravity="center" android:gravity="center"
android:paddingLeft="@dimen/suggestion_padding" android:paddingLeft="@dimen/config_suggestion_text_horizontal_padding"
android:paddingTop="0dp" android:paddingTop="0dp"
android:paddingRight="@dimen/suggestion_padding" android:paddingRight="@dimen/config_suggestion_text_horizontal_padding"
android:paddingBottom="0dp" android:paddingBottom="0dp"
android:hapticFeedbackEnabled="false" android:hapticFeedbackEnabled="false"
android:focusable="false" android:focusable="false"

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

@ -52,7 +52,7 @@
android:hint="@string/user_dict_settings_add_word_hint" android:hint="@string/user_dict_settings_add_word_hint"
android:imeOptions="flagNoFullscreen" android:imeOptions="flagNoFullscreen"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:maxLength="@integer/user_dictionary_max_word_length" > android:maxLength="@integer/config_user_dictionary_max_word_length" >
<requestFocus /> <requestFocus />
</EditText> </EditText>

4
java/res/layout/user_dictionary_add_word_fullscreen.xml
View File

@ -30,7 +30,7 @@
android:hint="@string/user_dict_settings_add_word_hint" android:hint="@string/user_dict_settings_add_word_hint"
android:imeOptions="flagNoFullscreen" android:imeOptions="flagNoFullscreen"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:maxLength="@integer/user_dictionary_max_word_length" > android:maxLength="@integer/config_user_dictionary_max_word_length" >
<requestFocus /> <requestFocus />
</EditText> </EditText>
@ -61,7 +61,7 @@
android:hint="@string/user_dict_settings_add_shortcut_hint" android:hint="@string/user_dict_settings_add_shortcut_hint"
android:imeOptions="flagNoFullscreen" android:imeOptions="flagNoFullscreen"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:maxLength="@integer/user_dictionary_max_word_length" /> android:maxLength="@integer/config_user_dictionary_max_word_length" />
<TextView <TextView
android:id="@+id/user_dictionary_add_locale_label" android:id="@+id/user_dictionary_add_locale_label"

92
java/res/values-land/config.xml
View File

@ -22,66 +22,64 @@
<resources> <resources>
<bool name="config_use_fullscreen_mode">true</bool> <bool name="config_use_fullscreen_mode">true</bool>
<!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
<!-- Preferable keyboard height in absolute scale: 1.100in --> <!-- Preferable keyboard height in absolute scale: 1.100in -->
<!-- This keyboardHeight value should match with keyboard-heights.xml --> <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
<dimen name="keyboardHeight">176.0dp</dimen> <dimen name="config_default_keyboard_height">176.0dp</dimen>
<fraction name="minKeyboardHeight">45%p</fraction> <fraction name="config_min_keyboard_height">45%p</fraction>
<!-- key_height + key_bottom_gap = popup_key_height --> <!-- key_height + key_bottom_gap = config_more_keys_keyboard_key_height -->
<dimen name="popup_key_height">44.8dp</dimen> <dimen name="config_more_keys_keyboard_key_height">44.8dp</dimen>
<fraction name="keyboard_top_padding_gb">1.818%p</fraction> <fraction name="config_keyboard_top_padding_gb">1.818%p</fraction>
<fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_gb">0.0%p</fraction>
<fraction name="key_bottom_gap_gb">5.941%p</fraction> <fraction name="config_key_vertical_gap_gb">5.941%p</fraction>
<fraction name="key_horizontal_gap_gb">0.997%p</fraction> <fraction name="config_key_horizontal_gap_gb">0.997%p</fraction>
<fraction name="keyboard_top_padding_holo">2.727%p</fraction> <fraction name="config_keyboard_top_padding_holo">2.727%p</fraction>
<fraction name="keyboard_bottom_padding_holo">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
<fraction name="key_bottom_gap_holo">5.368%p</fraction> <fraction name="config_key_vertical_gap_holo">5.368%p</fraction>
<fraction name="key_horizontal_gap_holo">1.020%p</fraction> <fraction name="config_key_horizontal_gap_holo">1.020%p</fraction>
<!-- left or right padding of label alignment --> <!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_padding">8dp</dimen> <dimen name="config_key_label_horizontal_padding">8dp</dimen>
<fraction name="key_letter_ratio">65%</fraction> <fraction name="config_key_letter_ratio">65%</fraction>
<fraction name="key_large_letter_ratio">74%</fraction> <fraction name="config_key_large_letter_ratio">74%</fraction>
<fraction name="key_label_ratio">40%</fraction> <fraction name="config_key_label_ratio">40%</fraction>
<fraction name="key_hint_letter_ratio">30%</fraction> <fraction name="config_key_hint_letter_ratio">30%</fraction>
<fraction name="key_hint_label_ratio">52%</fraction> <fraction name="config_key_hint_label_ratio">52%</fraction>
<fraction name="key_uppercase_letter_ratio">40%</fraction> <fraction name="config_key_uppercase_letter_ratio">40%</fraction>
<fraction name="key_preview_text_ratio">90%</fraction> <fraction name="config_key_preview_text_ratio">90%</fraction>
<fraction name="spacebar_text_ratio">40.000%</fraction> <fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction>
<dimen name="key_preview_offset_gb">0.0dp</dimen> <dimen name="config_key_preview_offset_gb">0.0dp</dimen>
<!-- For 5-row keyboard --> <!-- For 5-row keyboard -->
<fraction name="key_bottom_gap_5row">3.20%p</fraction> <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
<fraction name="key_letter_ratio_5row">78%</fraction> <fraction name="config_key_letter_ratio_5row">78%</fraction>
<fraction name="key_uppercase_letter_ratio_5row">48%</fraction> <fraction name="config_key_shifted_letter_hint_ratio_5row">48%</fraction>
<dimen name="key_preview_offset_holo">1.6dp</dimen> <dimen name="config_key_preview_offset_holo">1.6dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- config_more_keys_keyboard_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen>
<dimen name="suggestions_strip_height">36dp</dimen> <dimen name="config_suggestions_strip_height">36dp</dimen>
<dimen name="more_suggestions_row_height">36dp</dimen> <dimen name="config_more_suggestions_row_height">36dp</dimen>
<integer name="max_more_suggestions_row">2</integer> <integer name="config_max_more_suggestions_row">2</integer>
<fraction name="min_more_suggestions_width">60%</fraction> <fraction name="config_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 --> <!-- config_more_keys_keyboard_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">53.76dp</dimen> <dimen name="config_more_keys_keyboard_slide_allowance">53.76dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- config_more_keys_keyboard_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction_gb">-44.8dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_gb">-44.8dp</dimen>
<!-- Gesture floating preview text parameters --> <!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">23dp</dimen> <dimen name="config_gesture_floating_preview_text_size">23dp</dimen>
<dimen name="gesture_floating_preview_text_offset">54dp</dimen> <dimen name="config_gesture_floating_preview_text_offset">54dp</dimen>
<dimen name="gesture_floating_preview_horizontal_padding">23dp</dimen> <dimen name="config_gesture_floating_preview_horizontal_padding">23dp</dimen>
<dimen name="gesture_floating_preview_vertical_padding">15dp</dimen> <dimen name="config_gesture_floating_preview_vertical_padding">15dp</dimen>
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">10%p</fraction> <fraction name="config_emoji_keyboard_key_width">10%p</fraction>
<fraction name="emoji_keyboard_row_height">50%p</fraction> <fraction name="config_emoji_keyboard_row_height">50%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">54%p</fraction> <fraction name="config_emoji_keyboard_key_letter_size">54%p</fraction>
<integer name="emoji_keyboard_max_key_count">20</integer> <integer name="config_emoji_keyboard_max_page_key_count">20</integer>
</resources> </resources>

72
java/res/values-sw540dp-land/config.xml
View File

@ -22,55 +22,53 @@
<resources> <resources>
<bool name="config_use_fullscreen_mode">false</bool> <bool name="config_use_fullscreen_mode">false</bool>
<!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
<!-- Preferable keyboard height in absolute scale: 45.0mm --> <!-- Preferable keyboard height in absolute scale: 45.0mm -->
<!-- This keyboardHeight value should match with keyboard-heights.xml --> <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
<dimen name="keyboardHeight">283.5dp</dimen> <dimen name="config_default_keyboard_height">283.5dp</dimen>
<fraction name="minKeyboardHeight">45%p</fraction> <fraction name="config_min_keyboard_height">45%p</fraction>
<fraction name="keyboard_top_padding_gb">2.444%p</fraction> <fraction name="config_keyboard_top_padding_gb">2.444%p</fraction>
<fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_gb">0.0%p</fraction>
<fraction name="key_bottom_gap_gb">5.200%p</fraction> <fraction name="config_key_vertical_gap_gb">5.200%p</fraction>
<fraction name="key_horizontal_gap_gb">1.447%p</fraction> <fraction name="config_key_horizontal_gap_gb">1.447%p</fraction>
<fraction name="keyboard_top_padding_holo">2.727%p</fraction> <fraction name="config_keyboard_top_padding_holo">2.727%p</fraction>
<fraction name="keyboard_bottom_padding_holo">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
<fraction name="key_bottom_gap_holo">4.5%p</fraction> <fraction name="config_key_vertical_gap_holo">4.5%p</fraction>
<fraction name="key_horizontal_gap_holo">0.9%p</fraction> <fraction name="config_key_horizontal_gap_holo">0.9%p</fraction>
<dimen name="popup_key_height">81.9dp</dimen> <dimen name="config_more_keys_keyboard_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="config_key_label_horizontal_padding">18dp</dimen>
<fraction name="key_letter_ratio">50%</fraction> <fraction name="config_key_letter_ratio">50%</fraction>
<fraction name="key_large_letter_ratio">48%</fraction> <fraction name="config_key_large_letter_ratio">48%</fraction>
<fraction name="key_label_ratio">32%</fraction> <fraction name="config_key_label_ratio">32%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="key_hint_label_ratio">34%</fraction> <fraction name="config_key_hint_label_ratio">34%</fraction>
<fraction name="key_uppercase_letter_ratio">29%</fraction> <fraction name="config_key_uppercase_letter_ratio">29%</fraction>
<fraction name="spacebar_text_ratio">30.0%</fraction> <fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction>
<dimen name="key_uppercase_letter_padding">4dp</dimen> <dimen name="config_key_shifted_letter_hint_padding">4dp</dimen>
<!-- For 5-row keyboard --> <!-- For 5-row keyboard -->
<fraction name="key_bottom_gap_5row">3.20%p</fraction> <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
<fraction name="key_letter_ratio_5row">62%</fraction> <fraction name="config_key_letter_ratio_5row">62%</fraction>
<fraction name="key_uppercase_letter_ratio_5row">36%</fraction> <fraction name="config_key_shifted_letter_hint_ratio_5row">36%</fraction>
<dimen name="suggestions_strip_padding">252.0dp</dimen> <dimen name="config_suggestions_strip_horizontal_padding">252.0dp</dimen>
<integer name="max_more_suggestions_row">5</integer> <integer name="config_max_more_suggestions_row">5</integer>
<fraction name="min_more_suggestions_width">50%</fraction> <fraction name="config_min_more_suggestions_width">50%</fraction>
<!-- Gesture floating preview text parameters --> <!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">26dp</dimen> <dimen name="config_gesture_floating_preview_text_size">26dp</dimen>
<dimen name="gesture_floating_preview_text_offset">76dp</dimen> <dimen name="config_gesture_floating_preview_text_offset">76dp</dimen>
<dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen> <dimen name="config_gesture_floating_preview_horizontal_padding">26dp</dimen>
<dimen name="gesture_floating_preview_vertical_padding">17dp</dimen> <dimen name="config_gesture_floating_preview_vertical_padding">17dp</dimen>
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">10%p</fraction> <fraction name="config_emoji_keyboard_key_width">10%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">70%p</fraction> <fraction name="config_emoji_keyboard_key_letter_size">70%p</fraction>
<integer name="emoji_keyboard_max_key_count">30</integer> <integer name="config_emoji_keyboard_max_page_key_count">30</integer>
</resources> </resources>

114
java/res/values-sw540dp/config.xml
View File

@ -34,79 +34,77 @@
false --> false -->
<bool name="config_show_more_keys_keyboard_at_touched_point">true</bool> <bool name="config_show_more_keys_keyboard_at_touched_point">true</bool>
<!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
<!-- Preferable keyboard height in absolute scale: 48.0mm --> <!-- Preferable keyboard height in absolute scale: 48.0mm -->
<!-- This keyboardHeight value should match with keyboard-heights.xml --> <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
<dimen name="keyboardHeight">302.4dp</dimen> <dimen name="config_default_keyboard_height">302.4dp</dimen>
<fraction name="maxKeyboardHeight">46%p</fraction> <fraction name="config_max_keyboard_height">46%p</fraction>
<fraction name="minKeyboardHeight">-35.0%p</fraction> <fraction name="config_min_keyboard_height">-35.0%p</fraction>
<dimen name="popup_key_height">63.0dp</dimen> <dimen name="config_more_keys_keyboard_key_height">63.0dp</dimen>
<fraction name="keyboard_top_padding_gb">2.291%p</fraction> <fraction name="config_keyboard_top_padding_gb">2.291%p</fraction>
<fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_gb">0.0%p</fraction>
<fraction name="key_bottom_gap_gb">4.625%p</fraction> <fraction name="config_key_vertical_gap_gb">4.625%p</fraction>
<fraction name="key_horizontal_gap_gb">2.113%p</fraction> <fraction name="config_key_horizontal_gap_gb">2.113%p</fraction>
<fraction name="keyboard_top_padding_holo">2.335%p</fraction> <fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
<fraction name="keyboard_bottom_padding_holo">4.0%p</fraction> <fraction name="config_keyboard_bottom_padding_holo">4.0%p</fraction>
<fraction name="key_bottom_gap_holo">4.5%p</fraction> <fraction name="config_key_vertical_gap_holo">4.5%p</fraction>
<fraction name="key_horizontal_gap_holo">1.565%p</fraction> <fraction name="config_key_horizontal_gap_holo">1.565%p</fraction>
<dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen> <dimen name="config_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 --> <!-- config_more_keys_keyboard_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen> <dimen name="config_more_keys_keyboard_slide_allowance">98.3dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- config_more_keys_keyboard_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_gb">-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="config_key_label_horizontal_padding">6dp</dimen>
<dimen name="key_hint_letter_padding">3dp</dimen> <dimen name="config_key_hint_letter_padding">3dp</dimen>
<dimen name="key_uppercase_letter_padding">3dp</dimen> <dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
<fraction name="key_letter_ratio">42%</fraction> <fraction name="config_key_letter_ratio">42%</fraction>
<fraction name="key_large_letter_ratio">45%</fraction> <fraction name="config_key_large_letter_ratio">45%</fraction>
<fraction name="key_label_ratio">25%</fraction> <fraction name="config_key_label_ratio">25%</fraction>
<fraction name="key_large_label_ratio">32%</fraction> <fraction name="config_key_large_label_ratio">32%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="key_hint_label_ratio">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="key_uppercase_letter_ratio">22%</fraction> <fraction name="config_key_uppercase_letter_ratio">22%</fraction>
<fraction name="key_preview_text_ratio">50%</fraction> <fraction name="config_key_preview_text_ratio">50%</fraction>
<fraction name="spacebar_text_ratio">28.0%</fraction> <fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction>
<dimen name="key_preview_height">94.5dp</dimen> <dimen name="config_key_preview_height">94.5dp</dimen>
<dimen name="key_preview_offset_gb">16.0dp</dimen> <dimen name="config_key_preview_offset_gb">16.0dp</dimen>
<!-- For 5-row keyboard --> <!-- For 5-row keyboard -->
<fraction name="key_bottom_gap_5row">3.20%p</fraction> <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
<fraction name="key_letter_ratio_5row">52%</fraction> <fraction name="config_key_letter_ratio_5row">52%</fraction>
<fraction name="key_uppercase_letter_ratio_5row">27%</fraction> <fraction name="config_key_shifted_letter_hint_ratio_5row">27%</fraction>
<dimen name="key_preview_offset_holo">8.0dp</dimen> <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- config_more_keys_keyboard_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
<dimen name="suggestions_strip_height">44dp</dimen> <dimen name="config_suggestions_strip_height">44dp</dimen>
<dimen name="more_suggestions_row_height">44dp</dimen> <dimen name="config_more_suggestions_row_height">44dp</dimen>
<integer name="max_more_suggestions_row">6</integer> <integer name="config_max_more_suggestions_row">6</integer>
<fraction name="min_more_suggestions_width">90%</fraction> <fraction name="config_min_more_suggestions_width">90%</fraction>
<dimen name="suggestions_strip_padding">94.5dp</dimen> <dimen name="config_suggestions_strip_horizontal_padding">94.5dp</dimen>
<dimen name="suggestion_min_width">48.0dp</dimen> <dimen name="config_suggestion_min_width">48.0dp</dimen>
<dimen name="suggestion_padding">12dp</dimen> <dimen name="config_suggestion_text_horizontal_padding">12dp</dimen>
<dimen name="suggestion_text_size">22dp</dimen> <dimen name="config_suggestion_text_size">22dp</dimen>
<dimen name="more_suggestions_hint_text_size">33dp</dimen> <dimen name="config_more_suggestions_hint_text_size">33dp</dimen>
<!-- Gesture floating preview text parameters --> <!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">28dp</dimen> <dimen name="config_gesture_floating_preview_text_size">28dp</dimen>
<dimen name="gesture_floating_preview_text_offset">87dp</dimen> <dimen name="config_gesture_floating_preview_text_offset">87dp</dimen>
<dimen name="gesture_floating_preview_horizontal_padding">28dp</dimen> <dimen name="config_gesture_floating_preview_horizontal_padding">28dp</dimen>
<dimen name="gesture_floating_preview_vertical_padding">19dp</dimen> <dimen name="config_gesture_floating_preview_vertical_padding">19dp</dimen>
<dimen name="gesture_floating_preview_round_radius">3dp</dimen> <dimen name="config_gesture_floating_preview_round_radius">3dp</dimen>
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">12.5%p</fraction> <fraction name="config_emoji_keyboard_key_width">12.5%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">60%p</fraction> <fraction name="config_emoji_keyboard_key_letter_size">60%p</fraction>
<integer name="emoji_keyboard_max_key_count">24</integer> <integer name="config_emoji_keyboard_max_page_key_count">24</integer>
</resources> </resources>

72
java/res/values-sw768dp-land/config.xml
View File

@ -22,56 +22,54 @@
<resources> <resources>
<bool name="config_use_fullscreen_mode">false</bool> <bool name="config_use_fullscreen_mode">false</bool>
<!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
<!-- Preferable keyboard height in absolute scale: 58.0mm --> <!-- Preferable keyboard height in absolute scale: 58.0mm -->
<!-- This keyboardHeight value should match with keyboard-heights.xml --> <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
<dimen name="keyboardHeight">365.4dp</dimen> <dimen name="config_default_keyboard_height">365.4dp</dimen>
<fraction name="minKeyboardHeight">45%p</fraction> <fraction name="config_min_keyboard_height">45%p</fraction>
<fraction name="keyboard_top_padding_gb">1.896%p</fraction> <fraction name="config_keyboard_top_padding_gb">1.896%p</fraction>
<fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_gb">0.0%p</fraction>
<fraction name="key_bottom_gap_gb">3.896%p</fraction> <fraction name="config_key_vertical_gap_gb">3.896%p</fraction>
<fraction name="key_horizontal_gap_gb">1.195%p</fraction> <fraction name="config_key_horizontal_gap_gb">1.195%p</fraction>
<fraction name="keyboard_top_padding_holo">1.896%p</fraction> <fraction name="config_keyboard_top_padding_holo">1.896%p</fraction>
<fraction name="keyboard_bottom_padding_holo">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
<fraction name="key_bottom_gap_holo">3.690%p</fraction> <fraction name="config_key_vertical_gap_holo">3.690%p</fraction>
<fraction name="key_horizontal_gap_holo">1.030%p</fraction> <fraction name="config_key_horizontal_gap_holo">1.030%p</fraction>
<dimen name="popup_key_height">81.9dp</dimen> <dimen name="config_more_keys_keyboard_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="config_key_label_horizontal_padding">18dp</dimen>
<fraction name="key_letter_ratio">43%</fraction> <fraction name="config_key_letter_ratio">43%</fraction>
<fraction name="key_large_letter_ratio">42%</fraction> <fraction name="config_key_large_letter_ratio">42%</fraction>
<fraction name="key_label_ratio">28%</fraction> <fraction name="config_key_label_ratio">28%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="key_hint_label_ratio">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="key_uppercase_letter_ratio">24%</fraction> <fraction name="config_key_uppercase_letter_ratio">24%</fraction>
<fraction name="spacebar_text_ratio">24.00%</fraction> <fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction>
<dimen name="key_preview_height">107.1dp</dimen> <dimen name="config_key_preview_height">107.1dp</dimen>
<!-- For 5-row keyboard --> <!-- For 5-row keyboard -->
<fraction name="key_bottom_gap_5row">2.65%p</fraction> <fraction name="config_key_vertical_gap_5row">2.65%p</fraction>
<fraction name="key_letter_ratio_5row">53%</fraction> <fraction name="config_key_letter_ratio_5row">53%</fraction>
<fraction name="key_uppercase_letter_ratio_5row">30%</fraction> <fraction name="config_key_shifted_letter_hint_ratio_5row">30%</fraction>
<dimen name="key_preview_offset_holo">8.0dp</dimen> <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
<dimen name="suggestions_strip_padding">252.0dp</dimen> <dimen name="config_suggestions_strip_horizontal_padding">252.0dp</dimen>
<fraction name="min_more_suggestions_width">50%</fraction> <fraction name="config_min_more_suggestions_width">50%</fraction>
<!-- Gesture floating preview text parameters --> <!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">32dp</dimen> <dimen name="config_gesture_floating_preview_text_size">32dp</dimen>
<dimen name="gesture_floating_preview_text_offset">100dp</dimen> <dimen name="config_gesture_floating_preview_text_offset">100dp</dimen>
<dimen name="gesture_floating_preview_horizontal_padding">32dp</dimen> <dimen name="config_gesture_floating_preview_horizontal_padding">32dp</dimen>
<dimen name="gesture_floating_preview_vertical_padding">21dp</dimen> <dimen name="config_gesture_floating_preview_vertical_padding">21dp</dimen>
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">7.69%p</fraction> <fraction name="config_emoji_keyboard_key_width">7.69%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">60%p</fraction> <fraction name="config_emoji_keyboard_key_letter_size">60%p</fraction>
<integer name="emoji_keyboard_max_key_count">39</integer> <integer name="config_emoji_keyboard_max_page_key_count">39</integer>
</resources> </resources>

114
java/res/values-sw768dp/config.xml
View File

@ -34,79 +34,77 @@
false --> false -->
<bool name="config_show_more_keys_keyboard_at_touched_point">true</bool> <bool name="config_show_more_keys_keyboard_at_touched_point">true</bool>
<!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
<!-- Preferable keyboard height in absolute scale: 48.0mm --> <!-- Preferable keyboard height in absolute scale: 48.0mm -->
<!-- This keyboardHeight value should match with keyboard-heights.xml --> <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
<dimen name="keyboardHeight">302.4dp</dimen> <dimen name="config_default_keyboard_height">302.4dp</dimen>
<fraction name="maxKeyboardHeight">46%p</fraction> <fraction name="config_max_keyboard_height">46%p</fraction>
<fraction name="minKeyboardHeight">-35.0%p</fraction> <fraction name="config_min_keyboard_height">-35.0%p</fraction>
<fraction name="keyboard_top_padding_gb">2.291%p</fraction> <fraction name="config_keyboard_top_padding_gb">2.291%p</fraction>
<fraction name="keyboard_bottom_padding_gb">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_gb">0.0%p</fraction>
<fraction name="key_bottom_gap_gb">4.687%p</fraction> <fraction name="config_key_vertical_gap_gb">4.687%p</fraction>
<fraction name="key_horizontal_gap_gb">1.272%p</fraction> <fraction name="config_key_horizontal_gap_gb">1.272%p</fraction>
<fraction name="keyboard_top_padding_holo">2.335%p</fraction> <fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
<fraction name="keyboard_bottom_padding_holo">0.0%p</fraction> <fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
<fraction name="key_bottom_gap_holo">3.312%p</fraction> <fraction name="config_key_vertical_gap_holo">3.312%p</fraction>
<fraction name="key_horizontal_gap_holo">1.066%p</fraction> <fraction name="config_key_horizontal_gap_holo">1.066%p</fraction>
<dimen name="popup_key_height">63.0dp</dimen> <dimen name="config_more_keys_keyboard_key_height">63.0dp</dimen>
<dimen name="more_keys_keyboard_key_horizontal_padding">12dp</dimen> <dimen name="config_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 --> <!-- config_more_keys_keyboard_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">98.3dp</dimen> <dimen name="config_more_keys_keyboard_slide_allowance">98.3dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- config_more_keys_keyboard_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction_gb">-81.9dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_gb">-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="config_key_label_horizontal_padding">6dp</dimen>
<dimen name="key_hint_letter_padding">3dp</dimen> <dimen name="config_key_hint_letter_padding">3dp</dimen>
<dimen name="key_uppercase_letter_padding">3dp</dimen> <dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
<fraction name="key_letter_ratio">40%</fraction> <fraction name="config_key_letter_ratio">40%</fraction>
<fraction name="key_large_letter_ratio">42%</fraction> <fraction name="config_key_large_letter_ratio">42%</fraction>
<fraction name="key_label_ratio">28%</fraction> <fraction name="config_key_label_ratio">28%</fraction>
<fraction name="key_large_label_ratio">28%</fraction> <fraction name="config_key_large_label_ratio">28%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="key_hint_label_ratio">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="key_uppercase_letter_ratio">26%</fraction> <fraction name="config_key_uppercase_letter_ratio">26%</fraction>
<fraction name="key_preview_text_ratio">50%</fraction> <fraction name="config_key_preview_text_ratio">50%</fraction>
<fraction name="spacebar_text_ratio">29.03%</fraction> <fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction>
<dimen name="key_preview_height">94.5dp</dimen> <dimen name="config_key_preview_height">94.5dp</dimen>
<dimen name="key_preview_offset_gb">16.0dp</dimen> <dimen name="config_key_preview_offset_gb">16.0dp</dimen>
<!-- For 5-row keyboard --> <!-- For 5-row keyboard -->
<fraction name="key_bottom_gap_5row">2.95%p</fraction> <fraction name="config_key_vertical_gap_5row">2.95%p</fraction>
<fraction name="key_letter_ratio_5row">51%</fraction> <fraction name="config_key_letter_ratio_5row">51%</fraction>
<fraction name="key_uppercase_letter_ratio_5row">33%</fraction> <fraction name="config_key_shifted_letter_hint_ratio_5row">33%</fraction>
<dimen name="key_preview_offset_holo">8.0dp</dimen> <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- config_more_keys_keyboard_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>
<dimen name="suggestions_strip_height">44dp</dimen> <dimen name="config_suggestions_strip_height">44dp</dimen>
<dimen name="more_suggestions_row_height">44dp</dimen> <dimen name="config_more_suggestions_row_height">44dp</dimen>
<integer name="max_more_suggestions_row">6</integer> <integer name="config_max_more_suggestions_row">6</integer>
<fraction name="min_more_suggestions_width">90%</fraction> <fraction name="config_min_more_suggestions_width">90%</fraction>
<dimen name="suggestions_strip_padding">94.5dp</dimen> <dimen name="config_suggestions_strip_horizontal_padding">94.5dp</dimen>
<dimen name="suggestion_min_width">46dp</dimen> <dimen name="config_suggestion_min_width">46dp</dimen>
<dimen name="suggestion_padding">8dp</dimen> <dimen name="config_suggestion_text_horizontal_padding">8dp</dimen>
<dimen name="suggestion_text_size">22dp</dimen> <dimen name="config_suggestion_text_size">22dp</dimen>
<dimen name="more_suggestions_hint_text_size">33dp</dimen> <dimen name="config_more_suggestions_hint_text_size">33dp</dimen>
<!-- Gesture floating preview text parameters --> <!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">26dp</dimen> <dimen name="config_gesture_floating_preview_text_size">26dp</dimen>
<dimen name="gesture_floating_preview_text_offset">86dp</dimen> <dimen name="config_gesture_floating_preview_text_offset">86dp</dimen>
<dimen name="gesture_floating_preview_horizontal_padding">26dp</dimen> <dimen name="config_gesture_floating_preview_horizontal_padding">26dp</dimen>
<dimen name="gesture_floating_preview_vertical_padding">17dp</dimen> <dimen name="config_gesture_floating_preview_vertical_padding">17dp</dimen>
<dimen name="gesture_floating_preview_round_radius">3dp</dimen> <dimen name="config_gesture_floating_preview_round_radius">3dp</dimen>
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">10%p</fraction> <fraction name="config_emoji_keyboard_key_width">10%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">68%p</fraction> <fraction name="config_emoji_keyboard_key_letter_size">68%p</fraction>
<integer name="emoji_keyboard_max_key_count">30</integer> <integer name="config_emoji_keyboard_max_page_key_count">30</integer>
</resources> </resources>

6
java/res/values/attrs.xml
View File

@ -72,9 +72,9 @@
<attr name="autoCorrectionSpacebarLedEnabled" format="boolean" /> <attr name="autoCorrectionSpacebarLedEnabled" format="boolean" />
<attr name="autoCorrectionSpacebarLedIcon" format="reference" /> <attr name="autoCorrectionSpacebarLedIcon" format="reference" />
<!-- Size of the text for spacebar language label, in the proportion of key height. --> <!-- Size of the text for spacebar language label, in the proportion of key height. -->
<attr name="spacebarTextRatio" format="fraction" /> <attr name="languageOnSpacebarTextRatio" format="fraction" />
<attr name="spacebarTextColor" format="color" /> <attr name="languageOnSpacebarTextColor" format="color" />
<attr name="spacebarTextShadowColor" format="color" /> <attr name="languageOnSpacebarTextShadowColor" format="color" />
<!-- Fadeout animator for spacebar language label. --> <!-- Fadeout animator for spacebar language label. -->
<attr name="languageOnSpacebarFinalAlpha" format="integer" /> <attr name="languageOnSpacebarFinalAlpha" format="integer" />
<attr name="languageOnSpacebarFadeoutAnimator" format="reference" /> <attr name="languageOnSpacebarFadeoutAnimator" format="reference" />

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

@ -100,114 +100,112 @@
<!-- Suppress showing key preview duration after batch input in millisecond --> <!-- Suppress showing key preview duration after batch input in millisecond -->
<integer name="config_suppress_key_preview_after_batch_input_duration">1000</integer> <integer name="config_suppress_key_preview_after_batch_input_duration">1000</integer>
<!-- TODO: Add config_ prefix to the following resources that have been merged from dimens.xml -->
<!-- Preferable keyboard height in absolute scale: 1.285in --> <!-- Preferable keyboard height in absolute scale: 1.285in -->
<!-- This keyboardHeight value should match with keyboard-heights.xml --> <!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
<dimen name="keyboardHeight">205.6dp</dimen> <dimen name="config_default_keyboard_height">205.6dp</dimen>
<fraction name="maxKeyboardHeight">46%p</fraction> <fraction name="config_max_keyboard_height">46%p</fraction>
<fraction name="minKeyboardHeight">-61.8%p</fraction> <fraction name="config_min_keyboard_height">-61.8%p</fraction>
<dimen name="popup_key_height">52.8dp</dimen> <dimen name="config_more_keys_keyboard_key_height">52.8dp</dimen>
<dimen name="more_keys_keyboard_key_horizontal_padding">8dp</dimen> <dimen name="config_more_keys_keyboard_key_horizontal_padding">8dp</dimen>
<fraction name="keyboard_left_padding">0%p</fraction> <fraction name="config_keyboard_left_padding">0%p</fraction>
<fraction name="keyboard_right_padding">0%p</fraction> <fraction name="config_keyboard_right_padding">0%p</fraction>
<fraction name="keyboard_top_padding_gb">1.556%p</fraction> <fraction name="config_keyboard_top_padding_gb">1.556%p</fraction>
<fraction name="keyboard_bottom_padding_gb">4.669%p</fraction> <fraction name="config_keyboard_bottom_padding_gb">4.669%p</fraction>
<fraction name="key_bottom_gap_gb">6.495%p</fraction> <fraction name="config_key_vertical_gap_gb">6.495%p</fraction>
<fraction name="key_horizontal_gap_gb">1.971%p</fraction> <fraction name="config_key_horizontal_gap_gb">1.971%p</fraction>
<fraction name="keyboard_top_padding_holo">2.335%p</fraction> <fraction name="config_keyboard_top_padding_holo">2.335%p</fraction>
<fraction name="keyboard_bottom_padding_holo">4.669%p</fraction> <fraction name="config_keyboard_bottom_padding_holo">4.669%p</fraction>
<fraction name="key_bottom_gap_holo">6.127%p</fraction> <fraction name="config_key_vertical_gap_holo">6.127%p</fraction>
<fraction name="key_horizontal_gap_holo">1.739%p</fraction> <fraction name="config_key_horizontal_gap_holo">1.739%p</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 --> <!-- config_more_keys_keyboard_key_height x 1.2 -->
<dimen name="more_keys_keyboard_slide_allowance">63.36dp</dimen> <dimen name="config_more_keys_keyboard_slide_allowance">63.36dp</dimen>
<!-- popup_key_height x -1.0 --> <!-- config_more_keys_keyboard_key_height x -1.0 -->
<dimen name="more_keys_keyboard_vertical_correction_gb">-52.8dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_gb">-52.8dp</dimen>
<dimen name="keyboard_vertical_correction">0.0dp</dimen> <dimen name="config_keyboard_vertical_correction">0.0dp</dimen>
<fraction name="key_letter_ratio">55%</fraction> <fraction name="config_key_letter_ratio">55%</fraction>
<fraction name="key_large_letter_ratio">65%</fraction> <fraction name="config_key_large_letter_ratio">65%</fraction>
<fraction name="key_label_ratio">34%</fraction> <fraction name="config_key_label_ratio">34%</fraction>
<fraction name="key_large_label_ratio">40%</fraction> <fraction name="config_key_large_label_ratio">40%</fraction>
<fraction name="key_hint_letter_ratio">25%</fraction> <fraction name="config_key_hint_letter_ratio">25%</fraction>
<fraction name="key_hint_label_ratio">44%</fraction> <fraction name="config_key_hint_label_ratio">44%</fraction>
<fraction name="key_uppercase_letter_ratio">35%</fraction> <fraction name="config_key_uppercase_letter_ratio">35%</fraction>
<fraction name="key_preview_text_ratio">82%</fraction> <fraction name="config_key_preview_text_ratio">82%</fraction>
<fraction name="spacebar_text_ratio">33.735%</fraction> <fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction>
<dimen name="key_preview_height">80dp</dimen> <dimen name="config_key_preview_height">80dp</dimen>
<dimen name="key_preview_offset_gb">-8.0dp</dimen> <dimen name="config_key_preview_offset_gb">-8.0dp</dimen>
<dimen name="key_label_horizontal_padding">4dp</dimen> <dimen name="config_key_label_horizontal_padding">4dp</dimen>
<dimen name="key_hint_letter_padding">1dp</dimen> <dimen name="config_key_hint_letter_padding">1dp</dimen>
<dimen name="key_popup_hint_letter_padding">2dp</dimen> <dimen name="config_key_popup_hint_letter_padding">2dp</dimen>
<dimen name="key_uppercase_letter_padding">2dp</dimen> <dimen name="config_key_shifted_letter_hint_padding">2dp</dimen>
<!-- For 5-row keyboard --> <!-- For 5-row keyboard -->
<fraction name="key_bottom_gap_5row">3.20%p</fraction> <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
<fraction name="key_letter_ratio_5row">64%</fraction> <fraction name="config_key_letter_ratio_5row">64%</fraction>
<fraction name="key_uppercase_letter_ratio_5row">41%</fraction> <fraction name="config_key_shifted_letter_hint_ratio_5row">41%</fraction>
<dimen name="key_preview_offset_holo">8.0dp</dimen> <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
<!-- popup_key_height x -0.5 --> <!-- config_more_keys_keyboard_key_height x -0.5 -->
<dimen name="more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen> <dimen name="config_more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
<dimen name="suggestions_strip_height">40dp</dimen> <dimen name="config_suggestions_strip_height">40dp</dimen>
<dimen name="more_suggestions_key_horizontal_padding">12dp</dimen> <dimen name="config_more_suggestions_key_horizontal_padding">12dp</dimen>
<dimen name="more_suggestions_row_height">40dp</dimen> <dimen name="config_more_suggestions_row_height">40dp</dimen>
<dimen name="more_suggestions_bottom_gap">6dp</dimen> <dimen name="config_more_suggestions_bottom_gap">6dp</dimen>
<dimen name="more_suggestions_modal_tolerance">32.0dp</dimen> <dimen name="config_more_suggestions_modal_tolerance">32.0dp</dimen>
<integer name="max_more_suggestions_row">6</integer> <integer name="config_max_more_suggestions_row">6</integer>
<fraction name="min_more_suggestions_width">90%</fraction> <fraction name="config_min_more_suggestions_width">90%</fraction>
<fraction name="more_suggestions_info_ratio">18%</fraction> <fraction name="config_more_suggestions_info_ratio">18%</fraction>
<dimen name="suggestions_strip_padding">0dp</dimen> <dimen name="config_suggestions_strip_horizontal_padding">0dp</dimen>
<dimen name="suggestion_min_width">44dp</dimen> <dimen name="config_suggestion_min_width">44dp</dimen>
<dimen name="suggestion_padding">6dp</dimen> <dimen name="config_suggestion_text_horizontal_padding">6dp</dimen>
<dimen name="suggestion_text_size">18dp</dimen> <dimen name="config_suggestion_text_size">18dp</dimen>
<dimen name="more_suggestions_hint_text_size">27dp</dimen> <dimen name="config_more_suggestions_hint_text_size">27dp</dimen>
<integer name="suggestions_count_in_strip">3</integer> <integer name="config_suggestions_count_in_strip">3</integer>
<fraction name="center_suggestion_percentile">36%</fraction> <fraction name="config_center_suggestion_percentile">36%</fraction>
<!-- Gesture trail parameters --> <!-- Gesture trail parameters -->
<!-- Minimum distance between gesture trail sampling points. --> <!-- Minimum distance between gesture trail sampling points. -->
<dimen name="gesture_trail_min_sampling_distance">9.6dp</dimen> <dimen name="config_gesture_trail_min_sampling_distance">9.6dp</dimen>
<!-- Maximum angular threshold between gesture trails interpolation segments in degree. --> <!-- Maximum angular threshold between gesture trails interpolation segments in degree. -->
<integer name="gesture_trail_max_interpolation_angular_threshold">15</integer> <integer name="config_gesture_trail_max_interpolation_angular_threshold">15</integer>
<!-- Maximum distance threshold between gesture trails interpolation segments. --> <!-- Maximum distance threshold between gesture trails interpolation segments. -->
<dimen name="gesture_trail_max_interpolation_distance_threshold">16.0dp</dimen> <dimen name="config_gesture_trail_max_interpolation_distance_threshold">16.0dp</dimen>
<!-- Maximum number of gesture trail interpolation segments. --> <!-- Maximum number of gesture trail interpolation segments. -->
<integer name="gesture_trail_max_interpolation_segments">6</integer> <integer name="config_gesture_trail_max_interpolation_segments">6</integer>
<dimen name="gesture_trail_start_width">10.0dp</dimen> <dimen name="config_gesture_trail_start_width">10.0dp</dimen>
<dimen name="gesture_trail_end_width">2.5dp</dimen> <dimen name="config_gesture_trail_end_width">2.5dp</dimen>
<!-- Percentages of gesture preview taril body and shadow, in proportion to the trail width. <!-- Percentages of gesture preview taril body and shadow, in proportion to the trail width.
A negative value of the shadow ratio disables drawing shadow. --> A negative value of the shadow ratio disables drawing shadow. -->
<!-- TODO: May use the shadow to alleviate rugged trail drawing. --> <!-- TODO: May use the shadow to alleviate rugged trail drawing. -->
<integer name="gesture_trail_body_ratio">100</integer> <integer name="config_gesture_trail_body_ratio">100</integer>
<integer name="gesture_trail_shadow_ratio">-1</integer> <integer name="config_gesture_trail_shadow_ratio">-1</integer>
<!-- Gesture floating preview text parameters --> <!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">24dp</dimen> <dimen name="config_gesture_floating_preview_text_size">24dp</dimen>
<dimen name="gesture_floating_preview_text_offset">73dp</dimen> <dimen name="config_gesture_floating_preview_text_offset">73dp</dimen>
<dimen name="gesture_floating_preview_horizontal_padding">24dp</dimen> <dimen name="config_gesture_floating_preview_horizontal_padding">24dp</dimen>
<dimen name="gesture_floating_preview_vertical_padding">16dp</dimen> <dimen name="config_gesture_floating_preview_vertical_padding">16dp</dimen>
<dimen name="gesture_floating_preview_round_radius">2dp</dimen> <dimen name="config_gesture_floating_preview_round_radius">2dp</dimen>
<!-- Emoji keyboard --> <!-- Emoji keyboard -->
<fraction name="emoji_keyboard_key_width">14.2857%p</fraction> <fraction name="config_emoji_keyboard_key_width">14.2857%p</fraction>
<fraction name="emoji_keyboard_row_height">33%p</fraction> <fraction name="config_emoji_keyboard_row_height">33%p</fraction>
<fraction name="emoji_keyboard_key_letter_size">68%p</fraction> <fraction name="config_emoji_keyboard_key_letter_size">68%p</fraction>
<integer name="emoji_keyboard_max_key_count">21</integer> <integer name="config_emoji_keyboard_max_page_key_count">21</integer>
<dimen name="emoji_category_page_id_height">3dp</dimen> <dimen name="config_emoji_category_page_id_height">3dp</dimen>
<!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. --> <!-- Inset used in Accessibility mode to avoid accidental key presses when a finger slides off the screen. -->
<dimen name="accessibility_edge_slop">8dp</dimen> <dimen name="config_accessibility_edge_slop">8dp</dimen>
<integer name="user_dictionary_max_word_length" translatable="false">48</integer> <integer name="config_user_dictionary_max_word_length" translatable="false">48</integer>
<dimen name="language_on_spacebar_horizontal_margin">1dp</dimen> <dimen name="config_language_on_spacebar_horizontal_margin">1dp</dimen>
</resources> </resources>

68
java/res/values/themes-common.xml
View File

@ -25,43 +25,43 @@
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_default</item> <item name="touchPositionCorrectionData">@array/touch_position_correction_data_default</item>
<item name="rowHeight">25%p</item> <item name="rowHeight">25%p</item>
<item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item> <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item>
<item name="keyboardLeftPadding">@fraction/keyboard_left_padding</item> <item name="keyboardLeftPadding">@fraction/config_keyboard_left_padding</item>
<item name="keyboardRightPadding">@fraction/keyboard_right_padding</item> <item name="keyboardRightPadding">@fraction/config_keyboard_right_padding</item>
<item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item> <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
</style> </style>
<style name="KeyboardView"> <style name="KeyboardView">
<item name="keyBackground">@drawable/btn_keyboard_key_klp</item> <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
<item name="keyLetterSize">@fraction/key_letter_ratio</item> <item name="keyLetterSize">@fraction/config_key_letter_ratio</item>
<item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item> <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
<item name="keyLabelSize">@fraction/key_label_ratio</item> <item name="keyLabelSize">@fraction/config_key_label_ratio</item>
<item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item> <item name="keyLargeLabelRatio">@fraction/config_key_large_label_ratio</item>
<item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item> <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item>
<item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item> <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
<item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item> <item name="keyShiftedLetterHintRatio">@fraction/config_key_uppercase_letter_ratio</item>
<item name="keyTypeface">normal</item> <item name="keyTypeface">normal</item>
<item name="keyLabelHorizontalPadding">@dimen/key_label_horizontal_padding</item> <item name="keyLabelHorizontalPadding">@dimen/config_key_label_horizontal_padding</item>
<item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item> <item name="keyHintLetterPadding">@dimen/config_key_hint_letter_padding</item>
<item name="keyPopupHintLetterPadding">@dimen/key_popup_hint_letter_padding</item> <item name="keyPopupHintLetterPadding">@dimen/config_key_popup_hint_letter_padding</item>
<item name="keyShiftedLetterHintPadding">@dimen/key_uppercase_letter_padding</item> <item name="keyShiftedLetterHintPadding">@dimen/config_key_shifted_letter_hint_padding</item>
<item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item> <item name="keyPreviewTextRatio">@fraction/config_key_preview_text_ratio</item>
<item name="verticalCorrection">@dimen/keyboard_vertical_correction</item> <item name="verticalCorrection">@dimen/config_keyboard_vertical_correction</item>
<item name="backgroundDimAlpha">128</item> <item name="backgroundDimAlpha">128</item>
<item name="gestureFloatingPreviewTextSize">@dimen/gesture_floating_preview_text_size</item> <item name="gestureFloatingPreviewTextSize">@dimen/config_gesture_floating_preview_text_size</item>
<item name="gestureFloatingPreviewTextOffset">@dimen/gesture_floating_preview_text_offset</item> <item name="gestureFloatingPreviewTextOffset">@dimen/config_gesture_floating_preview_text_offset</item>
<item name="gestureFloatingPreviewHorizontalPadding">@dimen/gesture_floating_preview_horizontal_padding</item> <item name="gestureFloatingPreviewHorizontalPadding">@dimen/config_gesture_floating_preview_horizontal_padding</item>
<item name="gestureFloatingPreviewVerticalPadding">@dimen/gesture_floating_preview_vertical_padding</item> <item name="gestureFloatingPreviewVerticalPadding">@dimen/config_gesture_floating_preview_vertical_padding</item>
<item name="gestureFloatingPreviewRoundRadius">@dimen/gesture_floating_preview_round_radius</item> <item name="gestureFloatingPreviewRoundRadius">@dimen/config_gesture_floating_preview_round_radius</item>
<item name="gestureTrailMinSamplingDistance">@dimen/gesture_trail_min_sampling_distance</item> <item name="gestureTrailMinSamplingDistance">@dimen/config_gesture_trail_min_sampling_distance</item>
<item name="gestureTrailMaxInterpolationAngularThreshold">@integer/gesture_trail_max_interpolation_angular_threshold</item> <item name="gestureTrailMaxInterpolationAngularThreshold">@integer/config_gesture_trail_max_interpolation_angular_threshold</item>
<item name="gestureTrailMaxInterpolationDistanceThreshold">@dimen/gesture_trail_max_interpolation_distance_threshold</item> <item name="gestureTrailMaxInterpolationDistanceThreshold">@dimen/config_gesture_trail_max_interpolation_distance_threshold</item>
<item name="gestureTrailMaxInterpolationSegments">@integer/gesture_trail_max_interpolation_segments</item> <item name="gestureTrailMaxInterpolationSegments">@integer/config_gesture_trail_max_interpolation_segments</item>
<item name="gestureTrailFadeoutStartDelay">@integer/config_gesture_trail_fadeout_start_delay</item> <item name="gestureTrailFadeoutStartDelay">@integer/config_gesture_trail_fadeout_start_delay</item>
<item name="gestureTrailFadeoutDuration">@integer/config_gesture_trail_fadeout_duration</item> <item name="gestureTrailFadeoutDuration">@integer/config_gesture_trail_fadeout_duration</item>
<item name="gestureTrailUpdateInterval">@integer/config_gesture_trail_update_interval</item> <item name="gestureTrailUpdateInterval">@integer/config_gesture_trail_update_interval</item>
<item name="gestureTrailStartWidth">@dimen/gesture_trail_start_width</item> <item name="gestureTrailStartWidth">@dimen/config_gesture_trail_start_width</item>
<item name="gestureTrailEndWidth">@dimen/gesture_trail_end_width</item> <item name="gestureTrailEndWidth">@dimen/config_gesture_trail_end_width</item>
<item name="gestureTrailBodyRatio">@integer/gesture_trail_body_ratio</item> <item name="gestureTrailBodyRatio">@integer/config_gesture_trail_body_ratio</item>
<item name="gestureTrailShadowRatio">@integer/gesture_trail_shadow_ratio</item> <item name="gestureTrailShadowRatio">@integer/config_gesture_trail_shadow_ratio</item>
<!-- Common attributes of MainKeyboardView --> <!-- Common attributes of MainKeyboardView -->
<item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item> <item name="keyHysteresisDistance">@dimen/config_key_hysteresis_distance</item>
<item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item> <item name="keyHysteresisDistanceForSlidingModifier">@dimen/config_key_hysteresis_distance_for_sliding_modifier</item>
@ -76,13 +76,13 @@
<item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item> <item name="longPressShiftLockTimeout">@integer/config_longpress_shift_lock_timeout</item>
<item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item> <item name="ignoreAltCodeKeyTimeout">@integer/config_ignore_alt_code_key_timeout</item>
<item name="keyPreviewLayout">@layout/key_preview</item> <item name="keyPreviewLayout">@layout/key_preview</item>
<item name="keyPreviewHeight">@dimen/key_preview_height</item> <item name="keyPreviewHeight">@dimen/config_key_preview_height</item>
<item name="keyPreviewZoomInDuration">@integer/config_key_preview_zoom_in_duration</item> <item name="keyPreviewZoomInDuration">@integer/config_key_preview_zoom_in_duration</item>
<item name="keyPreviewZoomOutDuration">@integer/config_key_preview_zoom_out_duration</item> <item name="keyPreviewZoomOutDuration">@integer/config_key_preview_zoom_out_duration</item>
<item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item> <item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item>
<item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item> <item name="moreKeysKeyboardLayout">@layout/more_keys_keyboard</item>
<item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item> <item name="showMoreKeysKeyboardAtTouchedPoint">@bool/config_show_more_keys_keyboard_at_touched_point</item>
<item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item> <item name="languageOnSpacebarTextRatio">@fraction/config_language_on_spacebar_text_ratio</item>
<item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item> <item name="languageOnSpacebarFinalAlpha">@integer/config_language_on_spacebar_final_alpha</item>
<item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item> <item name="languageOnSpacebarFadeoutAnimator">@anim/language_on_spacebar_fadeout</item>
<!-- Remove animations for now because it could drain a non-negligible amount of battery while typing. <!-- Remove animations for now because it could drain a non-negligible amount of battery while typing.
@ -122,10 +122,10 @@
parent="MainKeyboardView" /> parent="MainKeyboardView" />
<style name="MoreKeysKeyboardContainer" /> <style name="MoreKeysKeyboardContainer" />
<style name="SuggestionStripView"> <style name="SuggestionStripView">
<item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item> <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
<item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item> <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
<item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item> <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
<item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item> <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
</style> </style>
<style name="SuggestionWord" /> <style name="SuggestionWord" />
<style name="MoreKeysKeyboardAnimation"> <style name="MoreKeysKeyboardAnimation">

16
java/res/values/themes-gb.xml
View File

@ -58,10 +58,10 @@
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
<item name="themeId">1</item> <item name="themeId">1</item>
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_gb</item> <item name="touchPositionCorrectionData">@array/touch_position_correction_data_gb</item>
<item name="keyboardTopPadding">@fraction/keyboard_top_padding_gb</item> <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_gb</item>
<item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_gb</item> <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_gb</item>
<item name="horizontalGap">@fraction/key_horizontal_gap_gb</item> <item name="horizontalGap">@fraction/config_key_horizontal_gap_gb</item>
<item name="verticalGap">@fraction/key_bottom_gap_gb</item> <item name="verticalGap">@fraction/config_key_vertical_gap_gb</item>
</style> </style>
<style <style
name="KeyboardView.GB" name="KeyboardView.GB"
@ -84,15 +84,15 @@
name="MainKeyboardView.GB" name="MainKeyboardView.GB"
parent="KeyboardView.GB" parent="KeyboardView.GB"
> >
<item name="keyPreviewOffset">@dimen/key_preview_offset_gb</item> <item name="keyPreviewOffset">@dimen/config_key_preview_offset_gb</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_gb</item> <item name="gestureFloatingPreviewTextColor">@color/highlight_color_gb</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_gb</item> <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_gb</item>
<item name="gestureTrailColor">@color/highlight_color_gb</item> <item name="gestureTrailColor">@color/highlight_color_gb</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_gb</item> <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_gb</item>
<item name="autoCorrectionSpacebarLedEnabled">true</item> <item name="autoCorrectionSpacebarLedEnabled">true</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_gb</item> <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_gb</item>
<item name="spacebarTextColor">@color/spacebar_text_color_gb</item> <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_gb</item>
<item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_gb</item> <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_gb</item>
</style> </style>
<style <style
name="KeyPreviewTextView.GB" name="KeyPreviewTextView.GB"
@ -125,7 +125,7 @@
<item name="android:background">@drawable/keyboard_popup_panel_background_gb</item> <item name="android:background">@drawable/keyboard_popup_panel_background_gb</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_gb</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_gb</item>
<item name="keyTypeface">normal</item> <item name="keyTypeface">normal</item>
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_gb</item> <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_gb</item>
</style> </style>
<style <style
name="SuggestionStripView.GB" name="SuggestionStripView.GB"

16
java/res/values/themes-ics.xml
View File

@ -36,10 +36,10 @@
> >
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
<item name="themeId">2</item> <item name="themeId">2</item>
<item name="keyboardTopPadding">@fraction/keyboard_top_padding_holo</item> <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item>
<item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_holo</item> <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item>
<item name="horizontalGap">@fraction/key_horizontal_gap_holo</item> <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item>
<item name="verticalGap">@fraction/key_bottom_gap_holo</item> <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item>
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
</style> </style>
<style <style
@ -63,15 +63,15 @@
name="MainKeyboardView.ICS" name="MainKeyboardView.ICS"
parent="KeyboardView.ICS" parent="KeyboardView.ICS"
> >
<item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item> <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item> <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item> <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
<item name="gestureTrailColor">@color/highlight_color_ics</item> <item name="gestureTrailColor">@color/highlight_color_ics</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</item> <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</item>
<item name="autoCorrectionSpacebarLedEnabled">false</item> <item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item> <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
<item name="spacebarTextColor">@color/spacebar_text_color_holo</item> <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
<item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item> <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
</style> </style>
<style <style
name="KeyPreviewTextView.ICS" name="KeyPreviewTextView.ICS"
@ -104,7 +104,7 @@
<item name="android:background">@drawable/keyboard_popup_panel_background_ics</item> <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
<item name="keyTypeface">normal</item> <item name="keyTypeface">normal</item>
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item> <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
</style> </style>
<style <style
name="SuggestionStripView.ICS" name="SuggestionStripView.ICS"

16
java/res/values/themes-klp.xml
View File

@ -36,10 +36,10 @@
> >
<!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] --> <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->
<item name="themeId">0</item> <item name="themeId">0</item>
<item name="keyboardTopPadding">@fraction/keyboard_top_padding_holo</item> <item name="keyboardTopPadding">@fraction/config_keyboard_top_padding_holo</item>
<item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_holo</item> <item name="keyboardBottomPadding">@fraction/config_keyboard_bottom_padding_holo</item>
<item name="horizontalGap">@fraction/key_horizontal_gap_holo</item> <item name="horizontalGap">@fraction/config_key_horizontal_gap_holo</item>
<item name="verticalGap">@fraction/key_bottom_gap_holo</item> <item name="verticalGap">@fraction/config_key_vertical_gap_holo</item>
<item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item> <item name="touchPositionCorrectionData">@array/touch_position_correction_data_holo</item>
</style> </style>
<style <style
@ -63,15 +63,15 @@
name="MainKeyboardView.KLP" name="MainKeyboardView.KLP"
parent="KeyboardView.KLP" parent="KeyboardView.KLP"
> >
<item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item> <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item> <item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item> <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
<item name="gestureTrailColor">@color/highlight_color_klp</item> <item name="gestureTrailColor">@color/highlight_color_klp</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_klp</item> <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_klp</item>
<item name="autoCorrectionSpacebarLedEnabled">false</item> <item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item> <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
<item name="spacebarTextColor">@color/spacebar_text_color_holo</item> <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
<item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item> <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
</style> </style>
<style <style
name="KeyPreviewTextView.KLP" name="KeyPreviewTextView.KLP"
@ -104,7 +104,7 @@
<item name="android:background">@drawable/keyboard_popup_panel_background_klp</item> <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
<item name="keyTypeface">normal</item> <item name="keyTypeface">normal</item>
<item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_holo</item> <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
</style> </style>
<style <style
name="SuggestionStripView.KLP" name="SuggestionStripView.KLP"

2
java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
View File

@ -20,7 +20,7 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="5%p" latin:keyWidth="5%p"
latin:rowHeight="@dimen/popup_key_height" latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
style="?attr/moreKeysKeyboardStyle" style="?attr/moreKeysKeyboardStyle"
> >
</Keyboard> </Keyboard>

2
java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
View File

@ -20,7 +20,7 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="8%p" latin:keyWidth="8%p"
latin:rowHeight="@dimen/popup_key_height" latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
style="?attr/moreKeysKeyboardStyle" style="?attr/moreKeysKeyboardStyle"
> >
</Keyboard> </Keyboard>

6
java/res/xml/kbd_armenian_phonetic.xml
View File

@ -21,9 +21,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p" latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5row" latin:verticalGap="@fraction/config_key_vertical_gap_5row"
latin:keyLetterSize="@fraction/key_letter_ratio_5row" latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
> >
<include <include

4
java/res/xml/kbd_emoji_category1.xml
View File

@ -20,9 +20,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="@fraction/emoji_keyboard_key_width" latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p" latin:keyLetterSize="90%p"
latin:rowHeight="@fraction/emoji_keyboard_row_height" latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_faces" latin:codesArray="@array/emoji_faces"

4
java/res/xml/kbd_emoji_category2.xml
View File

@ -20,9 +20,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="@fraction/emoji_keyboard_key_width" latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p" latin:keyLetterSize="90%p"
latin:rowHeight="@fraction/emoji_keyboard_row_height" latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_objects" latin:codesArray="@array/emoji_objects"

4
java/res/xml/kbd_emoji_category3.xml
View File

@ -20,9 +20,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="@fraction/emoji_keyboard_key_width" latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p" latin:keyLetterSize="90%p"
latin:rowHeight="@fraction/emoji_keyboard_row_height" latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_nature" latin:codesArray="@array/emoji_nature"

4
java/res/xml/kbd_emoji_category4.xml
View File

@ -20,9 +20,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="@fraction/emoji_keyboard_key_width" latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p" latin:keyLetterSize="90%p"
latin:rowHeight="@fraction/emoji_keyboard_row_height" latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_places" latin:codesArray="@array/emoji_places"

4
java/res/xml/kbd_emoji_category5.xml
View File

@ -20,9 +20,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="@fraction/emoji_keyboard_key_width" latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p" latin:keyLetterSize="90%p"
latin:rowHeight="@fraction/emoji_keyboard_row_height" latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_symbols" latin:codesArray="@array/emoji_symbols"

4
java/res/xml/kbd_emoji_category6.xml
View File

@ -20,10 +20,10 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="@fraction/emoji_keyboard_key_width" latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="90%p" latin:keyLetterSize="90%p"
latin:keyLabelSize="60%p" latin:keyLabelSize="60%p"
latin:rowHeight="@fraction/emoji_keyboard_row_height" latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
> >
<GridRows <GridRows
latin:textsArray="@array/emoji_emoticons" latin:textsArray="@array/emoji_emoticons"

6
java/res/xml/kbd_emoji_recents.xml
View File

@ -20,10 +20,10 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="@fraction/emoji_keyboard_key_width" latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
latin:keyLetterSize="@fraction/emoji_keyboard_key_letter_size" latin:keyLetterSize="@fraction/config_emoji_keyboard_key_letter_size"
latin:keyLabelSize="60%p" latin:keyLabelSize="60%p"
latin:rowHeight="@fraction/emoji_keyboard_row_height" latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
> >
<GridRows <GridRows
latin:codesArray="@array/emoji_recents" latin:codesArray="@array/emoji_recents"

6
java/res/xml/kbd_khmer.xml
View File

@ -21,9 +21,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p" latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5row" latin:verticalGap="@fraction/config_key_vertical_gap_5row"
latin:keyLetterSize="@fraction/key_letter_ratio_5row" latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
> >
<include <include

6
java/res/xml/kbd_lao.xml
View File

@ -21,9 +21,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p" latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5row" latin:verticalGap="@fraction/config_key_vertical_gap_5row"
latin:keyLetterSize="@fraction/key_letter_ratio_5row" latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
> >
<include <include

2
java/res/xml/kbd_more_keys_keyboard_template.xml
View File

@ -20,7 +20,7 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:rowHeight="@dimen/popup_key_height" latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
style="?attr/moreKeysKeyboardStyle" style="?attr/moreKeysKeyboardStyle"
> >
</Keyboard> </Keyboard>

6
java/res/xml/kbd_pcqwerty.xml
View File

@ -21,9 +21,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p" latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5row" latin:verticalGap="@fraction/config_key_vertical_gap_5row"
latin:keyLetterSize="@fraction/key_letter_ratio_5row" latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
> >
<include <include

2
java/res/xml/kbd_suggestions_pane_template.xml
View File

@ -20,6 +20,6 @@
<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:rowHeight="@dimen/more_suggestions_row_height" latin:rowHeight="@dimen/config_more_suggestions_row_height"
> >
</Keyboard> </Keyboard>

6
java/res/xml/kbd_thai.xml
View File

@ -21,9 +21,9 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p" latin:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5row" latin:verticalGap="@fraction/config_key_vertical_gap_5row"
latin:keyLetterSize="@fraction/key_letter_ratio_5row" latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
> >
<include <include

2
java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
View File

@ -82,7 +82,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
private void initInternal(final InputMethodService inputMethod) { private void initInternal(final InputMethodService inputMethod) {
mInputMethod = inputMethod; mInputMethod = inputMethod;
mEdgeSlop = inputMethod.getResources().getDimensionPixelSize( mEdgeSlop = inputMethod.getResources().getDimensionPixelSize(
R.dimen.accessibility_edge_slop); R.dimen.config_accessibility_edge_slop);
} }
/** /**

4
java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
View File

@ -149,7 +149,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
public EmojiCategory(final SharedPreferences prefs, final Resources res, public EmojiCategory(final SharedPreferences prefs, final Resources res,
final KeyboardLayoutSet layoutSet) { final KeyboardLayoutSet layoutSet) {
mPrefs = prefs; mPrefs = prefs;
mMaxPageKeyCount = res.getInteger(R.integer.emoji_keyboard_max_key_count); mMaxPageKeyCount = res.getInteger(R.integer.config_emoji_keyboard_max_page_key_count);
mLayoutSet = layoutSet; mLayoutSet = layoutSet;
for (int i = 0; i < sCategoryName.length; ++i) { for (int i = 0; i < sCategoryName.length; ++i) {
mCategoryNameToIdMap.put(sCategoryName[i], i); mCategoryNameToIdMap.put(sCategoryName[i], i);
@ -427,7 +427,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
final int width = ResourceUtils.getDefaultKeyboardWidth(res) final int width = ResourceUtils.getDefaultKeyboardWidth(res)
+ getPaddingLeft() + getPaddingRight(); + getPaddingLeft() + getPaddingRight();
final int height = ResourceUtils.getDefaultKeyboardHeight(res) final int height = ResourceUtils.getDefaultKeyboardHeight(res)
+ res.getDimensionPixelSize(R.dimen.suggestions_strip_height) + res.getDimensionPixelSize(R.dimen.config_suggestions_strip_height)
+ getPaddingTop() + getPaddingBottom(); + getPaddingTop() + getPaddingBottom();
setMeasuredDimension(width, height); setMeasuredDimension(width, height);
} }

42
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View File

@ -24,6 +24,7 @@ import android.animation.ObjectAnimator;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
@ -83,9 +84,9 @@ import java.util.WeakHashMap;
* *
* @attr ref R.styleable#MainKeyboardView_autoCorrectionSpacebarLedEnabled * @attr ref R.styleable#MainKeyboardView_autoCorrectionSpacebarLedEnabled
* @attr ref R.styleable#MainKeyboardView_autoCorrectionSpacebarLedIcon * @attr ref R.styleable#MainKeyboardView_autoCorrectionSpacebarLedIcon
* @attr ref R.styleable#MainKeyboardView_spacebarTextRatio * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextRatio
* @attr ref R.styleable#MainKeyboardView_spacebarTextColor * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextColor
* @attr ref R.styleable#MainKeyboardView_spacebarTextShadowColor * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextShadowColor
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFinalAlpha * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFinalAlpha
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFadeoutAnimator * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFadeoutAnimator
* @attr ref R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeoutAnimator * @attr ref R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeoutAnimator
@ -136,10 +137,10 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
private boolean mNeedsToDisplayLanguage; private boolean mNeedsToDisplayLanguage;
private boolean mHasMultipleEnabledIMEsOrSubtypes; private boolean mHasMultipleEnabledIMEsOrSubtypes;
private int mLanguageOnSpacebarAnimAlpha = Constants.Color.ALPHA_OPAQUE; private int mLanguageOnSpacebarAnimAlpha = Constants.Color.ALPHA_OPAQUE;
private final float mSpacebarTextRatio; private final float mLanguageOnSpacebarTextRatio;
private float mSpacebarTextSize; private float mLanguageOnSpacebarTextSize;
private final int mSpacebarTextColor; private final int mLanguageOnSpacebarTextColor;
private final int mSpacebarTextShadowColor; private final int mLanguageOnSpacebarTextShadowColor;
// The minimum x-scale to fit the language name on spacebar. // The minimum x-scale to fit the language name on spacebar.
private static final float MINIMUM_XSCALE_OF_LANGUAGE_NAME = 0.8f; private static final float MINIMUM_XSCALE_OF_LANGUAGE_NAME = 0.8f;
// Stuff to draw auto correction LED on spacebar. // Stuff to draw auto correction LED on spacebar.
@ -213,7 +214,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
public MainKeyboardView(final Context context, final AttributeSet attrs, final int defStyle) { public MainKeyboardView(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle); super(context, attrs, defStyle);
PointerTracker.init(getResources()); final Resources res = getResources();
PointerTracker.init(res);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
final boolean forceNonDistinctMultitouch = prefs.getBoolean( final boolean forceNonDistinctMultitouch = prefs.getBoolean(
DebugSettings.PREF_FORCE_NON_DISTINCT_MULTITOUCH, false); DebugSettings.PREF_FORCE_NON_DISTINCT_MULTITOUCH, false);
@ -235,12 +237,12 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
R.styleable.MainKeyboardView_autoCorrectionSpacebarLedEnabled, false); R.styleable.MainKeyboardView_autoCorrectionSpacebarLedEnabled, false);
mAutoCorrectionSpacebarLedIcon = mainKeyboardViewAttr.getDrawable( mAutoCorrectionSpacebarLedIcon = mainKeyboardViewAttr.getDrawable(
R.styleable.MainKeyboardView_autoCorrectionSpacebarLedIcon); R.styleable.MainKeyboardView_autoCorrectionSpacebarLedIcon);
mSpacebarTextRatio = mainKeyboardViewAttr.getFraction( mLanguageOnSpacebarTextRatio = mainKeyboardViewAttr.getFraction(
R.styleable.MainKeyboardView_spacebarTextRatio, 1, 1, 1.0f); R.styleable.MainKeyboardView_languageOnSpacebarTextRatio, 1, 1, 1.0f);
mSpacebarTextColor = mainKeyboardViewAttr.getColor( mLanguageOnSpacebarTextColor = mainKeyboardViewAttr.getColor(
R.styleable.MainKeyboardView_spacebarTextColor, 0); R.styleable.MainKeyboardView_languageOnSpacebarTextColor, 0);
mSpacebarTextShadowColor = mainKeyboardViewAttr.getColor( mLanguageOnSpacebarTextShadowColor = mainKeyboardViewAttr.getColor(
R.styleable.MainKeyboardView_spacebarTextShadowColor, 0); R.styleable.MainKeyboardView_languageOnSpacebarTextShadowColor, 0);
mLanguageOnSpacebarFinalAlpha = mainKeyboardViewAttr.getInt( mLanguageOnSpacebarFinalAlpha = mainKeyboardViewAttr.getInt(
R.styleable.MainKeyboardView_languageOnSpacebarFinalAlpha, R.styleable.MainKeyboardView_languageOnSpacebarFinalAlpha,
Constants.Color.ALPHA_OPAQUE); Constants.Color.ALPHA_OPAQUE);
@ -311,8 +313,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
mKeyboardActionListener = KeyboardActionListener.EMPTY_LISTENER; mKeyboardActionListener = KeyboardActionListener.EMPTY_LISTENER;
mLanguageOnSpacebarHorizontalMargin = mLanguageOnSpacebarHorizontalMargin = (int)res.getDimension(
(int) getResources().getDimension(R.dimen.language_on_spacebar_horizontal_margin); R.dimen.config_language_on_spacebar_horizontal_margin);
} }
@Override @Override
@ -445,7 +447,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
mSpaceIcon = (mSpaceKey != null) mSpaceIcon = (mSpaceKey != null)
? mSpaceKey.getIcon(keyboard.mIconsSet, Constants.Color.ALPHA_OPAQUE) : null; ? mSpaceKey.getIcon(keyboard.mIconsSet, Constants.Color.ALPHA_OPAQUE) : null;
final int keyHeight = keyboard.mMostCommonKeyHeight - keyboard.mVerticalGap; final int keyHeight = keyboard.mMostCommonKeyHeight - keyboard.mVerticalGap;
mSpacebarTextSize = keyHeight * mSpacebarTextRatio; mLanguageOnSpacebarTextSize = keyHeight * mLanguageOnSpacebarTextRatio;
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
final int orientation = getContext().getResources().getConfiguration().orientation; final int orientation = getContext().getResources().getConfiguration().orientation;
ResearchLogger.mainKeyboardView_setKeyboard(keyboard, orientation); ResearchLogger.mainKeyboardView_setKeyboard(keyboard, orientation);
@ -1190,17 +1192,17 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
if (mNeedsToDisplayLanguage) { if (mNeedsToDisplayLanguage) {
paint.setTextAlign(Align.CENTER); paint.setTextAlign(Align.CENTER);
paint.setTypeface(Typeface.DEFAULT); paint.setTypeface(Typeface.DEFAULT);
paint.setTextSize(mSpacebarTextSize); paint.setTextSize(mLanguageOnSpacebarTextSize);
final InputMethodSubtype subtype = getKeyboard().mId.mSubtype; final InputMethodSubtype subtype = getKeyboard().mId.mSubtype;
final String language = layoutLanguageOnSpacebar(paint, subtype, width); final String language = layoutLanguageOnSpacebar(paint, subtype, width);
// Draw language text with shadow // Draw language text with shadow
final float descent = paint.descent(); final float descent = paint.descent();
final float textHeight = -paint.ascent() + descent; final float textHeight = -paint.ascent() + descent;
final float baseline = height / 2 + textHeight / 2; final float baseline = height / 2 + textHeight / 2;
paint.setColor(mSpacebarTextShadowColor); paint.setColor(mLanguageOnSpacebarTextShadowColor);
paint.setAlpha(mLanguageOnSpacebarAnimAlpha); paint.setAlpha(mLanguageOnSpacebarAnimAlpha);
canvas.drawText(language, width / 2, baseline - descent - 1, paint); canvas.drawText(language, width / 2, baseline - descent - 1, paint);
paint.setColor(mSpacebarTextColor); paint.setColor(mLanguageOnSpacebarTextColor);
paint.setAlpha(mLanguageOnSpacebarAnimAlpha); paint.setAlpha(mLanguageOnSpacebarAnimAlpha);
canvas.drawText(language, width / 2, baseline - descent, paint); canvas.drawText(language, width / 2, baseline - descent, paint);
} }

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

@ -298,7 +298,7 @@ public final class MoreKeysKeyboard extends Keyboard {
height = keyPreviewDrawParams.mPreviewVisibleHeight + mParams.mVerticalGap; height = keyPreviewDrawParams.mPreviewVisibleHeight + mParams.mVerticalGap;
} else { } else {
final float padding = context.getResources().getDimension( final float padding = context.getResources().getDimension(
R.dimen.more_keys_keyboard_key_horizontal_padding) R.dimen.config_more_keys_keyboard_key_horizontal_padding)
+ (parentKey.hasLabelsInMoreKeys() + (parentKey.hasLabelsInMoreKeys()
? mParams.mDefaultKeyWidth * LABEL_PADDING_RATIO : 0.0f); ? mParams.mDefaultKeyWidth * LABEL_PADDING_RATIO : 0.0f);
width = getMaxKeyWidth(parentKey, mParams.mDefaultKeyWidth, padding, width = getMaxKeyWidth(parentKey, mParams.mDefaultKeyWidth, padding,

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

@ -52,7 +52,7 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
final Resources res = context.getResources(); final Resources res = context.getResources();
mKeyDetector = new MoreKeysDetector( mKeyDetector = new MoreKeysDetector(
res.getDimension(R.dimen.more_keys_keyboard_slide_allowance)); res.getDimension(R.dimen.config_more_keys_keyboard_slide_allowance));
} }
@Override @Override

10
java/src/com/android/inputmethod/keyboard/internal/EmojiLayoutParams.java
View File

@ -40,16 +40,16 @@ public class EmojiLayoutParams {
public EmojiLayoutParams(final Resources res) { public EmojiLayoutParams(final Resources res) {
final int defaultKeyboardHeight = ResourceUtils.getDefaultKeyboardHeight(res); final int defaultKeyboardHeight = ResourceUtils.getDefaultKeyboardHeight(res);
final int defaultKeyboardWidth = ResourceUtils.getDefaultKeyboardWidth(res); final int defaultKeyboardWidth = ResourceUtils.getDefaultKeyboardWidth(res);
mKeyVerticalGap = (int) res.getFraction(R.fraction.key_bottom_gap_holo, mKeyVerticalGap = (int) res.getFraction(R.fraction.config_key_vertical_gap_holo,
defaultKeyboardHeight, defaultKeyboardHeight); defaultKeyboardHeight, defaultKeyboardHeight);
mBottomPadding = (int) res.getFraction(R.fraction.keyboard_bottom_padding_holo, mBottomPadding = (int) res.getFraction(R.fraction.config_keyboard_bottom_padding_holo,
defaultKeyboardHeight, defaultKeyboardHeight); defaultKeyboardHeight, defaultKeyboardHeight);
mTopPadding = (int) res.getFraction(R.fraction.keyboard_top_padding_holo, mTopPadding = (int) res.getFraction(R.fraction.config_keyboard_top_padding_holo,
defaultKeyboardHeight, defaultKeyboardHeight); defaultKeyboardHeight, defaultKeyboardHeight);
mKeyHorizontalGap = (int) (res.getFraction(R.fraction.key_horizontal_gap_holo, mKeyHorizontalGap = (int) (res.getFraction(R.fraction.config_key_horizontal_gap_holo,
defaultKeyboardWidth, defaultKeyboardWidth)); defaultKeyboardWidth, defaultKeyboardWidth));
mEmojiCategoryPageIdViewHeight = mEmojiCategoryPageIdViewHeight =
(int) (res.getDimension(R.dimen.emoji_category_page_id_height)); (int) (res.getDimension(R.dimen.config_emoji_category_page_id_height));
final int baseheight = defaultKeyboardHeight - mBottomPadding - mTopPadding final int baseheight = defaultKeyboardHeight - mBottomPadding - mTopPadding
+ mKeyVerticalGap; + mKeyVerticalGap;
mEmojiActionBarHeight = baseheight / DEFAULT_KEYBOARD_ROWS mEmojiActionBarHeight = baseheight / DEFAULT_KEYBOARD_ROWS

3
java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java
View File

@ -66,7 +66,8 @@ public final class MoreSuggestions extends Keyboard {
clearKeys(); clearKeys();
mDivider = res.getDrawable(R.drawable.more_suggestions_divider); mDivider = res.getDrawable(R.drawable.more_suggestions_divider);
mDividerWidth = mDivider.getIntrinsicWidth(); mDividerWidth = mDivider.getIntrinsicWidth();
final float padding = res.getDimension(R.dimen.more_suggestions_key_horizontal_padding); final float padding = res.getDimension(
R.dimen.config_more_suggestions_key_horizontal_padding);
int row = 0; int row = 0;
int index = fromIndex; int index = fromIndex;

2
java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java
View File

@ -54,7 +54,7 @@ public final class MoreSuggestionsView extends MoreKeysKeyboardView {
public void adjustVerticalCorrectionForModalMode() { public void adjustVerticalCorrectionForModalMode() {
// Set vertical correction to zero (Reset more keys keyboard sliding allowance // Set vertical correction to zero (Reset more keys keyboard sliding allowance
// {@link R#dimen.more_keys_keyboard_slide_allowance}). // {@link R#dimen.config_more_keys_keyboard_slide_allowance}).
mKeyDetector.setKeyboard(getKeyboard(), -getPaddingLeft(), -getPaddingTop()); mKeyDetector.setKeyboard(getKeyboard(), -getPaddingLeft(), -getPaddingTop());
} }

11
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
View File

@ -119,7 +119,8 @@ final class SuggestionStripLayoutHelper {
mDividerWidth = dividerView.getMeasuredWidth(); mDividerWidth = dividerView.getMeasuredWidth();
final Resources res = wordView.getResources(); final Resources res = wordView.getResources();
mSuggestionsStripHeight = res.getDimensionPixelSize(R.dimen.suggestions_strip_height); mSuggestionsStripHeight = res.getDimensionPixelSize(
R.dimen.config_suggestions_strip_height);
final TypedArray a = context.obtainStyledAttributes(attrs, final TypedArray a = context.obtainStyledAttributes(attrs,
R.styleable.SuggestionStripView, defStyle, R.style.SuggestionStripView); R.styleable.SuggestionStripView, defStyle, R.style.SuggestionStripView);
@ -145,15 +146,17 @@ final class SuggestionStripLayoutHelper {
a.recycle(); a.recycle();
mMoreSuggestionsHint = getMoreSuggestionsHint(res, mMoreSuggestionsHint = getMoreSuggestionsHint(res,
res.getDimension(R.dimen.more_suggestions_hint_text_size), mColorAutoCorrect); res.getDimension(R.dimen.config_more_suggestions_hint_text_size),
mColorAutoCorrect);
mCenterPositionInStrip = mSuggestionsCountInStrip / 2; mCenterPositionInStrip = mSuggestionsCountInStrip / 2;
// Assuming there are at least three suggestions. Also, note that the suggestions are // Assuming there are at least three suggestions. Also, note that the suggestions are
// laid out according to script direction, so this is left of the center for LTR scripts // laid out according to script direction, so this is left of the center for LTR scripts
// and right of the center for RTL scripts. // and right of the center for RTL scripts.
mTypedWordPositionWhenAutocorrect = mCenterPositionInStrip - 1; mTypedWordPositionWhenAutocorrect = mCenterPositionInStrip - 1;
mMoreSuggestionsBottomGap = res.getDimensionPixelOffset( mMoreSuggestionsBottomGap = res.getDimensionPixelOffset(
R.dimen.more_suggestions_bottom_gap); R.dimen.config_more_suggestions_bottom_gap);
mMoreSuggestionsRowHeight = res.getDimensionPixelSize(R.dimen.more_suggestions_row_height); mMoreSuggestionsRowHeight = res.getDimensionPixelSize(
R.dimen.config_more_suggestions_row_height);
final LayoutInflater inflater = LayoutInflater.from(context); final LayoutInflater inflater = LayoutInflater.from(context);
mWordToSaveView = (TextView)inflater.inflate(R.layout.suggestion_word, null); mWordToSaveView = (TextView)inflater.inflate(R.layout.suggestion_word, null);

2
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View File

@ -112,7 +112,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
final Resources res = context.getResources(); final Resources res = context.getResources();
mMoreSuggestionsModalTolerance = res.getDimensionPixelOffset( mMoreSuggestionsModalTolerance = res.getDimensionPixelOffset(
R.dimen.more_suggestions_modal_tolerance); R.dimen.config_more_suggestions_modal_tolerance);
mMoreSuggestionsSlidingDetector = new GestureDetector( mMoreSuggestionsSlidingDetector = new GestureDetector(
context, mMoreSuggestionsSlidingListener); context, mMoreSuggestionsSlidingListener);
} }

8
java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
View File

@ -227,19 +227,19 @@ public final class ResourceUtils {
final String keyboardHeightString = getDeviceOverrideValue(res, R.array.keyboard_heights); final String keyboardHeightString = getDeviceOverrideValue(res, R.array.keyboard_heights);
final float keyboardHeight; final float keyboardHeight;
if (TextUtils.isEmpty(keyboardHeightString)) { if (TextUtils.isEmpty(keyboardHeightString)) {
keyboardHeight = res.getDimension(R.dimen.keyboardHeight); keyboardHeight = res.getDimension(R.dimen.config_default_keyboard_height);
} else { } else {
keyboardHeight = Float.parseFloat(keyboardHeightString) * dm.density; keyboardHeight = Float.parseFloat(keyboardHeightString) * dm.density;
} }
final float maxKeyboardHeight = res.getFraction( final float maxKeyboardHeight = res.getFraction(
R.fraction.maxKeyboardHeight, dm.heightPixels, dm.heightPixels); R.fraction.config_max_keyboard_height, dm.heightPixels, dm.heightPixels);
float minKeyboardHeight = res.getFraction( float minKeyboardHeight = res.getFraction(
R.fraction.minKeyboardHeight, dm.heightPixels, dm.heightPixels); R.fraction.config_min_keyboard_height, dm.heightPixels, dm.heightPixels);
if (minKeyboardHeight < 0.0f) { if (minKeyboardHeight < 0.0f) {
// Specified fraction was negative, so it should be calculated against display // Specified fraction was negative, so it should be calculated against display
// width. // width.
minKeyboardHeight = -res.getFraction( minKeyboardHeight = -res.getFraction(
R.fraction.minKeyboardHeight, dm.widthPixels, dm.widthPixels); R.fraction.config_min_keyboard_height, dm.widthPixels, dm.widthPixels);
} }
// Keyboard height will not exceed maxKeyboardHeight and will not be less than // Keyboard height will not exceed maxKeyboardHeight and will not be less than
// minKeyboardHeight. // minKeyboardHeight.