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

Merge "Rename PopupMiniKeyboardView to MiniKeyboardView"

main
Tadashi G. Takaoka 2011-08-30 23:39:14 -07:00 committed by Android (Google) Code Review
parent fcee70ea92 9237a72634
commit 0e7ee45f54
28 changed files with 79 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/layout/keyboard_popup.xml → java/res/layout/mini_keyboard.xml
View File

@ -22,9 +22,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
style="?attr/popupMiniKeyboardPanelStyle" style="?attr/miniKeyboardPanelStyle"
> >
<com.android.inputmethod.keyboard.PopupMiniKeyboardView <com.android.inputmethod.keyboard.MiniKeyboardView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
android:id="@+id/mini_keyboard_view" android:id="@+id/mini_keyboard_view"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"

2
java/res/values-ar/donottranslate-altchars.xml
View File

@ -31,7 +31,7 @@
\u064b: ARABIC FATHATAN \u064b: ARABIC FATHATAN
\u064d: ARABIC KASRATAN --> \u064d: ARABIC KASRATAN -->
<string name="alternates_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string> <string name="alternates_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string>
<integer name="popup_keyboard_column_for_punctuation">9</integer> <integer name="mini_keyboard_column_for_punctuation">9</integer>
<string name="keyhintlabel_for_punctuation">\u064b</string> <string name="keyhintlabel_for_punctuation">\u064b</string>
<string name="keylabel_for_symbols_1">"١"</string> <string name="keylabel_for_symbols_1">"١"</string>
<string name="keylabel_for_symbols_2">"٢"</string> <string name="keylabel_for_symbols_2">"٢"</string>

2
java/res/values-sw600dp/config.xml
View File

@ -39,5 +39,5 @@
<!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
<string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_default_keyboard_theme_id" translatable="false">5</string>
<string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>
<integer name="config_max_popup_keyboard_column">5</integer> <integer name="config_max_mini_keyboard_column">5</integer>
</resources> </resources>

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

@ -37,7 +37,7 @@
<!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
<string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_default_keyboard_theme_id" translatable="false">5</string>
<string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>
<integer name="config_max_popup_keyboard_column">5</integer> <integer name="config_max_mini_keyboard_column">5</integer>
<!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" -->
<integer name="log_screen_metrics">2</integer> <integer name="log_screen_metrics">2</integer>
</resources> </resources>

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

@ -22,9 +22,9 @@
<attr name="latinKeyboardStyle" format="reference" /> <attr name="latinKeyboardStyle" format="reference" />
<!-- KeyboardView style --> <!-- KeyboardView style -->
<attr name="keyboardViewStyle" format="reference" /> <attr name="keyboardViewStyle" format="reference" />
<!-- PopupMiniKeyboardView style --> <!-- MiniKeyboardView style -->
<attr name="popupMiniKeyboardViewStyle" format="reference" /> <attr name="miniKeyboardViewStyle" format="reference" />
<attr name="popupMiniKeyboardPanelStyle" format="reference" /> <attr name="miniKeyboardPanelStyle" format="reference" />
<!-- Suggestions strip style --> <!-- Suggestions strip style -->
<attr name="suggestionsStripBackgroundStyle" format="reference" /> <attr name="suggestionsStripBackgroundStyle" format="reference" />
<attr name="suggestionBackgroundStyle" format="reference" /> <attr name="suggestionBackgroundStyle" format="reference" />
@ -95,7 +95,7 @@
<!-- Amount to offset the touch Y coordinate by, for bias correction. --> <!-- Amount to offset the touch Y coordinate by, for bias correction. -->
<attr name="verticalCorrection" format="dimension" /> <attr name="verticalCorrection" format="dimension" />
<!-- Layout resource for popup keyboards. --> <!-- Layout resource for popup panel -->
<attr name="popupLayout" format="reference" /> <attr name="popupLayout" format="reference" />
<attr name="shadowColor" format="color" /> <attr name="shadowColor" format="color" />
@ -153,8 +153,8 @@
<attr name="horizontalGap" format="dimension|fraction" /> <attr name="horizontalGap" format="dimension|fraction" />
<!-- Default vertical gap between rows of keys. --> <!-- Default vertical gap between rows of keys. -->
<attr name="verticalGap" format="dimension|fraction" /> <attr name="verticalGap" format="dimension|fraction" />
<!-- Popup keyboard layout template --> <!-- Popup panel layout template -->
<attr name="popupKeyboardTemplate" format="reference" /> <attr name="popupTemplate" format="reference" />
<!-- Locale of the keyboard layout --> <!-- Locale of the keyboard layout -->
<attr name="keyboardLocale" format="string" /> <attr name="keyboardLocale" format="string" />
<!-- True if the keyboard is Right-To-Left --> <!-- True if the keyboard is Right-To-Left -->
@ -180,8 +180,8 @@
<attr name="code" format="integer" /> <attr name="code" format="integer" />
<!-- The characters to display in the popup keyboard. --> <!-- The characters to display in the popup keyboard. -->
<attr name="popupCharacters" format="string" /> <attr name="popupCharacters" format="string" />
<!-- Maximum column of popup keyboard --> <!-- Maximum column of mini keyboard -->
<attr name="maxPopupKeyboardColumn" format="integer" /> <attr name="maxMiniKeyboardColumn" format="integer" />
<!-- Whether this is a functional key which has different key top than normal key. --> <!-- Whether this is a functional key which has different key top than normal key. -->
<attr name="isFunctional" format="boolean" /> <attr name="isFunctional" format="boolean" />
<!-- Whether this is a toggle key. --> <!-- Whether this is a toggle key. -->

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

@ -67,7 +67,7 @@
<!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
<string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_default_keyboard_theme_id" translatable="false">5</string>
<string name="config_text_size_of_language_on_spacebar" translatable="false">small</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string>
<integer name="config_max_popup_keyboard_column">5</integer> <integer name="config_max_mini_keyboard_column">5</integer>
<string-array name="auto_correction_threshold_values" translatable="false"> <string-array name="auto_correction_threshold_values" translatable="false">
<!-- Off, When auto correction setting is Off, this value is not used. --> <!-- Off, When auto correction setting is Off, this value is not used. -->
<item></item> <item></item>

2
java/res/values/donottranslate-altchars.xml
View File

@ -51,7 +51,7 @@
<string name="alternates_for_currency_general">¢,$,€,£,¥,₱</string> <string name="alternates_for_currency_general">¢,$,€,£,¥,₱</string>
<string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string> <string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string>
<string name="alternates_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string> <string name="alternates_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&amp;,\@"</string>
<integer name="popup_keyboard_column_for_punctuation">7</integer> <integer name="mini_keyboard_column_for_punctuation">7</integer>
<string name="keyhintlabel_for_punctuation"></string> <string name="keyhintlabel_for_punctuation"></string>
<string name="keylabel_for_popular_domain">".com"</string> <string name="keylabel_for_popular_domain">".com"</string>
<!-- popular web domains for the locale - most popular, displayed on the keyboard --> <!-- popular web domains for the locale - most popular, displayed on the keyboard -->

28
java/res/values/styles.xml
View File

@ -21,12 +21,12 @@
<item name="keyboardHeight">@dimen/keyboardHeight</item> <item name="keyboardHeight">@dimen/keyboardHeight</item>
<item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item> <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>
<item name="minKeyboardHeight">@fraction/minKeyboardHeight</item> <item name="minKeyboardHeight">@fraction/minKeyboardHeight</item>
<item name="popupKeyboardTemplate">@xml/kbd_popup_template</item> <item name="popupTemplate">@xml/kbd_mini_keyboard_template</item>
<item name="keyboardTopPadding">@fraction/keyboard_top_padding</item> <item name="keyboardTopPadding">@fraction/keyboard_top_padding</item>
<item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item> <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item>
<item name="horizontalGap">@fraction/key_horizontal_gap</item> <item name="horizontalGap">@fraction/key_horizontal_gap</item>
<item name="verticalGap">@fraction/key_bottom_gap</item> <item name="verticalGap">@fraction/key_bottom_gap</item>
<item name="maxPopupKeyboardColumn">@integer/config_max_popup_keyboard_column</item> <item name="maxMiniKeyboardColumn">@integer/config_max_mini_keyboard_column</item>
</style> </style>
<style name="LatinKeyboard"> <style name="LatinKeyboard">
<item name="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled <item name="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled
@ -61,20 +61,20 @@
<item name="keyPreviewOffset">@dimen/key_preview_offset</item> <item name="keyPreviewOffset">@dimen/key_preview_offset</item>
<item name="keyPreviewHeight">@dimen/key_preview_height</item> <item name="keyPreviewHeight">@dimen/key_preview_height</item>
<item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item> <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item>
<item name="popupLayout">@layout/keyboard_popup</item> <item name="popupLayout">@layout/mini_keyboard</item>
<item name="verticalCorrection">@dimen/keyboard_vertical_correction</item> <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
<item name="shadowColor">#BB000000</item> <item name="shadowColor">#BB000000</item>
<item name="shadowRadius">2.75</item> <item name="shadowRadius">2.75</item>
<item name="backgroundDimAmount">0.5</item> <item name="backgroundDimAmount">0.5</item>
</style> </style>
<style <style
name="PopupMiniKeyboardView" name="MiniKeyboardView"
parent="KeyboardView" parent="KeyboardView"
> >
<item name="keyBackground">@drawable/btn_keyboard_key_popup</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup</item>
<item name="verticalCorrection">@dimen/mini_keyboard_vertical_correction</item> <item name="verticalCorrection">@dimen/mini_keyboard_vertical_correction</item>
</style> </style>
<style name="PopupMiniKeyboardPanelStyle"> <style name="MiniKeyboardPanelStyle">
<item name="android:background">@drawable/keyboard_popup_panel_background</item> <item name="android:background">@drawable/keyboard_popup_panel_background</item>
<item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding</item> <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding</item>
<item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding</item> <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding</item>
@ -139,8 +139,8 @@
<item name="shadowColor">#FFFFFFFF</item> <item name="shadowColor">#FFFFFFFF</item>
</style> </style>
<style <style
name="PopupMiniKeyboardView.Stone" name="MiniKeyboardView.Stone"
parent="PopupMiniKeyboardView" parent="MiniKeyboardView"
> >
<item name="keyBackground">@drawable/btn_keyboard_key_stone</item> <item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
<item name="keyTextColor">#FF000000</item> <item name="keyTextColor">#FF000000</item>
@ -170,8 +170,8 @@
<item name="keyTextStyle">bold</item> <item name="keyTextStyle">bold</item>
</style> </style>
<style <style
name="PopupMiniKeyboardView.Gingerbread" name="MiniKeyboardView.Gingerbread"
parent="PopupMiniKeyboardView" parent="MiniKeyboardView"
> >
<item name="android:background">@null</item> <item name="android:background">@null</item>
</style> </style>
@ -213,13 +213,13 @@
<item name="shadowRadius">0.0</item> <item name="shadowRadius">0.0</item>
</style> </style>
<style <style
name="PopupMiniKeyboardView.IceCreamSandwich" name="MiniKeyboardView.IceCreamSandwich"
parent="PopupMiniKeyboardView" parent="MiniKeyboardView"
> >
<item name="android:background">@null</item> <item name="android:background">@null</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
</style> </style>
<style name="PopupMiniKeyboardPanelStyle.IceCreamSandwich"> <style name="MiniKeyboardPanelStyle.IceCreamSandwich">
<item name="android:background">@drawable/btn_keyboard_key_popup_background_holo</item> <item name="android:background">@drawable/btn_keyboard_key_popup_background_holo</item>
<item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding_ics</item> <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding_ics</item>
<item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding_ics</item> <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding_ics</item>
@ -232,7 +232,7 @@
</style> </style>
<style <style
name="SuggestionPreviewBackgroundStyle.IceCreamSandwich" name="SuggestionPreviewBackgroundStyle.IceCreamSandwich"
parent="PopupMiniKeyboardPanelStyle.IceCreamSandwich" parent="MiniKeyboardPanelStyle.IceCreamSandwich"
> >
</style> </style>
<style <style
@ -246,7 +246,7 @@
<item name="candidateCountInStrip">@integer/candidate_count_in_strip</item> <item name="candidateCountInStrip">@integer/candidate_count_in_strip</item>
<item name="centerCandidatePercentile">@integer/center_candidate_percentile</item> <item name="centerCandidatePercentile">@integer/center_candidate_percentile</item>
</style> </style>
<style name="PopupMiniKeyboardAnimation"> <style name="MiniKeyboardAnimation">
<item name="android:windowEnterAnimation">@anim/mini_keyboard_fadein</item> <item name="android:windowEnterAnimation">@anim/mini_keyboard_fadein</item>
<item name="android:windowExitAnimation">@anim/mini_keyboard_fadeout</item> <item name="android:windowExitAnimation">@anim/mini_keyboard_fadeout</item>
</style> </style>

4
java/res/values/themes-basic-highcontrast.xml
View File

@ -19,8 +19,8 @@
<item name="keyboardStyle">@style/Keyboard</item> <item name="keyboardStyle">@style/Keyboard</item>
<item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item>
<item name="keyboardViewStyle">@style/KeyboardView.HighContrast</item> <item name="keyboardViewStyle">@style/KeyboardView.HighContrast</item>
<item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView</item> <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>
<item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

4
java/res/values/themes-basic.xml
View File

@ -19,8 +19,8 @@
<item name="keyboardStyle">@style/Keyboard</item> <item name="keyboardStyle">@style/Keyboard</item>
<item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item>
<item name="keyboardViewStyle">@style/KeyboardView</item> <item name="keyboardViewStyle">@style/KeyboardView</item>
<item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView</item> <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>
<item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

4
java/res/values/themes-gingerbread.xml
View File

@ -19,8 +19,8 @@
<item name="keyboardStyle">@style/Keyboard.Gingerbread</item> <item name="keyboardStyle">@style/Keyboard.Gingerbread</item>
<item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item>
<item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item> <item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item>
<item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Gingerbread</item> <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Gingerbread</item>
<item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

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

@ -19,8 +19,8 @@
<item name="keyboardStyle">@style/Keyboard.IceCreamSandwich</item> <item name="keyboardStyle">@style/Keyboard.IceCreamSandwich</item>
<item name="latinKeyboardStyle">@style/LatinKeyboard.IceCreamSandwich</item> <item name="latinKeyboardStyle">@style/LatinKeyboard.IceCreamSandwich</item>
<item name="keyboardViewStyle">@style/KeyboardView.IceCreamSandwich</item> <item name="keyboardViewStyle">@style/KeyboardView.IceCreamSandwich</item>
<item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.IceCreamSandwich</item> <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.IceCreamSandwich</item>
<item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle.IceCreamSandwich</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle.IceCreamSandwich</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item>

4
java/res/values/themes-stone-bold.xml
View File

@ -19,8 +19,8 @@
<item name="keyboardStyle">@style/Keyboard.Stone</item> <item name="keyboardStyle">@style/Keyboard.Stone</item>
<item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item> <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
<item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item> <item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item>
<item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Stone</item> <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item>
<item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

4
java/res/values/themes-stone.xml
View File

@ -19,8 +19,8 @@
<item name="keyboardStyle">@style/Keyboard.Stone</item> <item name="keyboardStyle">@style/Keyboard.Stone</item>
<item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item> <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
<item name="keyboardViewStyle">@style/KeyboardView.Stone</item> <item name="keyboardViewStyle">@style/KeyboardView.Stone</item>
<item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Stone</item> <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item>
<item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>
<item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>
<item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>
<item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

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

@ -73,7 +73,7 @@
latin:keyOutputText=":-) " latin:keyOutputText=":-) "
latin:keyLabelOption="hasPopupHint" latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" /> latin:maxMiniKeyboardColumn="5" />
<key-style <key-style
latin:styleName="shortcutKeyStyle" latin:styleName="shortcutKeyStyle"
latin:code="@integer/key_shortcut" latin:code="@integer/key_shortcut"

2
java/res/xml-sw768dp/kbd_key_styles.xml
View File

@ -55,7 +55,7 @@
latin:keyOutputText=":-) " latin:keyOutputText=":-) "
latin:keyLabelOption="hasPopupHint" latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" /> latin:maxMiniKeyboardColumn="5" />
<key-style <key-style
latin:styleName="settingsKeyStyle" latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings" latin:code="@integer/key_settings"

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

@ -91,7 +91,7 @@
latin:keyOutputText=":-) " latin:keyOutputText=":-) "
latin:keyLabelOption="hasPopupHint" latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" latin:maxMiniKeyboardColumn="5"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
</case> </case>
<case <case
@ -221,6 +221,6 @@
latin:keyHintLabel="@string/keyhintlabel_for_punctuation" latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
latin:keyLabelOption="hasPopupHint" latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_punctuation" latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="@integer/popup_keyboard_column_for_punctuation" latin:maxMiniKeyboardColumn="@integer/mini_keyboard_column_for_punctuation"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
</merge> </merge>

0
java/res/xml/kbd_popup_template.xml → java/res/xml/kbd_mini_keyboard_template.xml
View File

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

@ -106,7 +106,7 @@
<Key <Key
latin:keyLabel="&quot;" latin:keyLabel="&quot;"
latin:popupCharacters="“,”,«,»" latin:popupCharacters="“,”,«,»"
latin:maxPopupKeyboardColumn="6" /> latin:maxMiniKeyboardColumn="6" />
<Key <Key
latin:keyLabel="\'" latin:keyLabel="\'"
latin:popupCharacters="‘,’,‚,‛" /> latin:popupCharacters="‘,’,‚,‛" />

10
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -93,7 +93,7 @@ public class Key {
/** Popup characters */ /** Popup characters */
public final CharSequence[] mPopupCharacters; public final CharSequence[] mPopupCharacters;
/** Popup keyboard maximum column number */ /** Popup keyboard maximum column number */
public final int mMaxPopupColumn; public final int mMaxMiniKeyboardColumn;
/** /**
* Flags that specify the anchoring to edges of the keyboard for detecting touch events * Flags that specify the anchoring to edges of the keyboard for detecting touch events
@ -228,7 +228,7 @@ public class Key {
mSticky = false; mSticky = false;
mRepeatable = false; mRepeatable = false;
mPopupCharacters = null; mPopupCharacters = null;
mMaxPopupColumn = 0; mMaxMiniKeyboardColumn = 0;
mLabel = label; mLabel = label;
mOutputText = outputText; mOutputText = outputText;
mCode = code; mCode = code;
@ -323,9 +323,9 @@ public class Key {
} else { } else {
mPopupCharacters = popupCharacters; mPopupCharacters = popupCharacters;
} }
mMaxPopupColumn = style.getInt(keyboardAttr, mMaxMiniKeyboardColumn = style.getInt(keyboardAttr,
R.styleable.Keyboard_Key_maxPopupKeyboardColumn, R.styleable.Keyboard_Key_maxMiniKeyboardColumn,
params.mMaxPopupColumn); params.mMaxMiniKeyboardColumn);
mRepeatable = style.getBoolean(keyAttr, R.styleable.Keyboard_Key_isRepeatable, false); mRepeatable = style.getBoolean(keyAttr, R.styleable.Keyboard_Key_isRepeatable, false);
mFunctional = style.getBoolean(keyAttr, R.styleable.Keyboard_Key_isFunctional, false); mFunctional = style.getBoolean(keyAttr, R.styleable.Keyboard_Key_isFunctional, false);

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

@ -102,10 +102,10 @@ public class Keyboard {
public final int mMostCommonKeyWidth; public final int mMostCommonKeyWidth;
/** Popup keyboard template */ /** Popup keyboard template */
public final int mPopupKeyboardResId; public final int mPopupTemplateId;
/** Maximum column for popup keyboard */ /** Maximum column for mini keyboard */
public final int mMaxPopupColumn; public final int mMaxMiniKeyboardColumn;
/** True if Right-To-Left keyboard */ /** True if Right-To-Left keyboard */
public final boolean mIsRtlKeyboard; public final boolean mIsRtlKeyboard;
@ -130,8 +130,8 @@ public class Keyboard {
mWidth = params.mWidth; mWidth = params.mWidth;
mMostCommonKeyWidth = params.mMostCommonKeyWidth; mMostCommonKeyWidth = params.mMostCommonKeyWidth;
mIsRtlKeyboard = params.mIsRtlKeyboard; mIsRtlKeyboard = params.mIsRtlKeyboard;
mPopupKeyboardResId = params.mPopupKeyboardResId; mPopupTemplateId = params.mPopupTemplateId;
mMaxPopupColumn = params.mMaxPopupColumn; mMaxMiniKeyboardColumn = params.mMaxMiniKeyboardColumn;
mDefaultRowHeight = params.mDefaultRowHeight; mDefaultRowHeight = params.mDefaultRowHeight;
mVerticalGap = params.mVerticalGap; mVerticalGap = params.mVerticalGap;

8
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -35,7 +35,6 @@ import android.util.TypedValue;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
@ -78,7 +77,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
// Miscellaneous constants // Miscellaneous constants
private static final int[] LONG_PRESSABLE_STATE_SET = { android.R.attr.state_long_pressable }; private static final int[] LONG_PRESSABLE_STATE_SET = { android.R.attr.state_long_pressable };
// XML attribute // XML attributes
protected final float mVerticalCorrection;
protected final int mPopupLayout;
private final float mBackgroundDimAmount; private final float mBackgroundDimAmount;
// HORIZONTAL ELLIPSIS "...", character for popup hint. // HORIZONTAL ELLIPSIS "...", character for popup hint.
@ -340,6 +341,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
if (mKeyPreviewLayoutId == 0) { if (mKeyPreviewLayoutId == 0) {
mShowKeyPreviewPopup = false; mShowKeyPreviewPopup = false;
} }
mVerticalCorrection = a.getDimensionPixelOffset(
R.styleable.KeyboardView_verticalCorrection, 0);
mPopupLayout = a.getResourceId(R.styleable.KeyboardView_popupLayout, 0);
mBackgroundDimAmount = a.getFloat(R.styleable.KeyboardView_backgroundDimAmount, 0.5f); mBackgroundDimAmount = a.getFloat(R.styleable.KeyboardView_backgroundDimAmount, 0.5f);
a.recycle(); a.recycle();

20
java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
View File

@ -19,7 +19,6 @@ package com.android.inputmethod.keyboard;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.os.Message; import android.os.Message;
import android.os.SystemClock; import android.os.SystemClock;
@ -64,10 +63,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
// Timing constants // Timing constants
private final int mKeyRepeatInterval; private final int mKeyRepeatInterval;
// XML attribute
private final float mVerticalCorrection;
private final int mPopupLayout;
// Mini keyboard // Mini keyboard
private PopupWindow mPopupWindow; private PopupWindow mPopupWindow;
private PopupPanel mPopupPanel; private PopupPanel mPopupPanel;
@ -219,13 +214,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
mTouchScreenRegulator = new SuddenJumpingTouchEventHandler(getContext(), this); mTouchScreenRegulator = new SuddenJumpingTouchEventHandler(getContext(), this);
final TypedArray a = context.obtainStyledAttributes(
attrs, R.styleable.KeyboardView, defStyle, R.style.KeyboardView);
mVerticalCorrection = a.getDimensionPixelOffset(
R.styleable.KeyboardView_verticalCorrection, 0);
mPopupLayout = a.getResourceId(R.styleable.KeyboardView_popupLayout, 0);
a.recycle();
final Resources res = getResources(); final Resources res = getResources();
mConfigShowMiniKeyboardAtTouchedPoint = res.getBoolean( mConfigShowMiniKeyboardAtTouchedPoint = res.getBoolean(
R.bool.config_show_mini_keyboard_at_touched_point); R.bool.config_show_mini_keyboard_at_touched_point);
@ -374,11 +362,11 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
if (container == null) if (container == null)
throw new NullPointerException(); throw new NullPointerException();
final PopupMiniKeyboardView miniKeyboardView = final MiniKeyboardView miniKeyboardView =
(PopupMiniKeyboardView)container.findViewById(R.id.mini_keyboard_view); (MiniKeyboardView)container.findViewById(R.id.mini_keyboard_view);
final Keyboard parentKeyboard = getKeyboard(); final Keyboard parentKeyboard = getKeyboard();
final Keyboard miniKeyboard = new MiniKeyboard.Builder( final Keyboard miniKeyboard = new MiniKeyboard.Builder(
this, parentKeyboard.mPopupKeyboardResId, parentKey, parentKeyboard).build(); this, parentKeyboard.mPopupTemplateId, parentKey, parentKeyboard).build();
miniKeyboardView.setKeyboard(miniKeyboard); miniKeyboardView.setKeyboard(miniKeyboard);
container.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); container.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@ -454,7 +442,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
if (mPopupWindow == null) { if (mPopupWindow == null) {
mPopupWindow = new PopupWindow(getContext()); mPopupWindow = new PopupWindow(getContext());
mPopupWindow.setBackgroundDrawable(null); mPopupWindow.setBackgroundDrawable(null);
mPopupWindow.setAnimationStyle(R.style.PopupMiniKeyboardAnimation); mPopupWindow.setAnimationStyle(R.style.MiniKeyboardAnimation);
// Allow popup window to be drawn off the screen. // Allow popup window to be drawn off the screen.
mPopupWindow.setClippingEnabled(false); mPopupWindow.setClippingEnabled(false);
} }

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

@ -227,8 +227,8 @@ public class MiniKeyboard extends Keyboard {
mPopupCharacters = parentKey.mPopupCharacters; mPopupCharacters = parentKey.mPopupCharacters;
final int keyWidth = getMaxKeyWidth(view, mPopupCharacters, mParams.mDefaultKeyWidth); final int keyWidth = getMaxKeyWidth(view, mPopupCharacters, mParams.mDefaultKeyWidth);
mParams.setParameters(mPopupCharacters.length, parentKey.mMaxPopupColumn, keyWidth, mParams.setParameters(mPopupCharacters.length, parentKey.mMaxMiniKeyboardColumn,
parentKeyboard.mDefaultRowHeight, parentKey.mX keyWidth, parentKeyboard.mDefaultRowHeight, parentKey.mX
+ (mParams.mDefaultKeyWidth - keyWidth) / 2, view.getMeasuredWidth()); + (mParams.mDefaultKeyWidth - keyWidth) / 2, view.getMeasuredWidth());
} }

8
java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java → java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java
View File

@ -34,7 +34,7 @@ import java.util.List;
* A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting * A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting
* key presses and touch movements. * key presses and touch movements.
*/ */
public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel { public class MiniKeyboardView extends KeyboardView implements PopupPanel {
private final int[] mCoordinates = new int[2]; private final int[] mCoordinates = new int[2];
private final KeyDetector mKeyDetector; private final KeyDetector mKeyDetector;
@ -128,11 +128,11 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel {
} }
}; };
public PopupMiniKeyboardView(Context context, AttributeSet attrs) { public MiniKeyboardView(Context context, AttributeSet attrs) {
this(context, attrs, R.attr.popupMiniKeyboardViewStyle); this(context, attrs, R.attr.miniKeyboardViewStyle);
} }
public PopupMiniKeyboardView(Context context, AttributeSet attrs, int defStyle) { public MiniKeyboardView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle); super(context, attrs, defStyle);
final TypedArray a = context.obtainStyledAttributes( final TypedArray a = context.obtainStyledAttributes(

2
java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java
View File

@ -171,7 +171,7 @@ public class KeyStyles {
readInt(keyAttr, R.styleable.Keyboard_Key_keyIcon); readInt(keyAttr, R.styleable.Keyboard_Key_keyIcon);
readInt(keyAttr, R.styleable.Keyboard_Key_keyIconPreview); readInt(keyAttr, R.styleable.Keyboard_Key_keyIconPreview);
readInt(keyAttr, R.styleable.Keyboard_Key_keyIconShifted); readInt(keyAttr, R.styleable.Keyboard_Key_keyIconShifted);
readInt(keyAttr, R.styleable.Keyboard_Key_maxPopupKeyboardColumn); readInt(keyAttr, R.styleable.Keyboard_Key_maxMiniKeyboardColumn);
readBoolean(keyAttr, R.styleable.Keyboard_Key_isFunctional); readBoolean(keyAttr, R.styleable.Keyboard_Key_isFunctional);
readBoolean(keyAttr, R.styleable.Keyboard_Key_isSticky); readBoolean(keyAttr, R.styleable.Keyboard_Key_isSticky);
readBoolean(keyAttr, R.styleable.Keyboard_Key_isRepeatable); readBoolean(keyAttr, R.styleable.Keyboard_Key_isRepeatable);

8
java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
View File

@ -255,10 +255,10 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
mParams.mIsRtlKeyboard = keyboardAttr.getBoolean( mParams.mIsRtlKeyboard = keyboardAttr.getBoolean(
R.styleable.Keyboard_isRtlKeyboard, false); R.styleable.Keyboard_isRtlKeyboard, false);
mParams.mPopupKeyboardResId = keyboardAttr.getResourceId( mParams.mPopupTemplateId = keyboardAttr.getResourceId(
R.styleable.Keyboard_popupKeyboardTemplate, 0); R.styleable.Keyboard_popupTemplate, 0);
mParams.mMaxPopupColumn = keyAttr.getInt( mParams.mMaxMiniKeyboardColumn = keyAttr.getInt(
R.styleable.Keyboard_Key_maxPopupKeyboardColumn, 5); R.styleable.Keyboard_Key_maxMiniKeyboardColumn, 5);
mParams.mIconsSet.loadIcons(keyboardAttr); mParams.mIconsSet.loadIcons(keyboardAttr);
} finally { } finally {

4
java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java
View File

@ -49,8 +49,8 @@ public class KeyboardParams {
public int mVerticalGap; public int mVerticalGap;
public boolean mIsRtlKeyboard; public boolean mIsRtlKeyboard;
public int mPopupKeyboardResId; public int mPopupTemplateId;
public int mMaxPopupColumn; public int mMaxMiniKeyboardColumn;
public int GRID_WIDTH; public int GRID_WIDTH;
public int GRID_HEIGHT; public int GRID_HEIGHT;