diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/layout/mini_keyboard.xml (renamed from java/res/layout/keyboard_popup.xml) | 4 | ||||
-rw-r--r-- | java/res/values-ar/donottranslate-altchars.xml | 2 | ||||
-rw-r--r-- | java/res/values-sw600dp/config.xml | 2 | ||||
-rw-r--r-- | java/res/values-sw768dp/config.xml | 2 | ||||
-rw-r--r-- | java/res/values/attrs.xml | 16 | ||||
-rw-r--r-- | java/res/values/config.xml | 2 | ||||
-rw-r--r-- | java/res/values/donottranslate-altchars.xml | 2 | ||||
-rw-r--r-- | java/res/values/styles.xml | 28 | ||||
-rw-r--r-- | java/res/values/themes-basic-highcontrast.xml | 4 | ||||
-rw-r--r-- | java/res/values/themes-basic.xml | 4 | ||||
-rw-r--r-- | java/res/values/themes-gingerbread.xml | 4 | ||||
-rw-r--r-- | java/res/values/themes-ics.xml | 4 | ||||
-rw-r--r-- | java/res/values/themes-stone-bold.xml | 4 | ||||
-rw-r--r-- | java/res/values/themes-stone.xml | 4 | ||||
-rw-r--r-- | java/res/xml-sw600dp/kbd_key_styles.xml | 2 | ||||
-rw-r--r-- | java/res/xml-sw768dp/kbd_key_styles.xml | 2 | ||||
-rw-r--r-- | java/res/xml/kbd_key_styles.xml | 4 | ||||
-rw-r--r-- | java/res/xml/kbd_mini_keyboard_template.xml (renamed from java/res/xml/kbd_popup_template.xml) | 0 | ||||
-rw-r--r-- | java/res/xml/kbd_rows_symbols.xml | 2 |
19 files changed, 46 insertions, 46 deletions
diff --git a/java/res/layout/keyboard_popup.xml b/java/res/layout/mini_keyboard.xml index e2508da78..6964ec5d6 100644 --- a/java/res/layout/keyboard_popup.xml +++ b/java/res/layout/mini_keyboard.xml @@ -22,9 +22,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" 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" android:id="@+id/mini_keyboard_view" android:layout_alignParentBottom="true" diff --git a/java/res/values-ar/donottranslate-altchars.xml b/java/res/values-ar/donottranslate-altchars.xml index 0e4f265e7..6f2a3ff7d 100644 --- a/java/res/values-ar/donottranslate-altchars.xml +++ b/java/res/values-ar/donottranslate-altchars.xml @@ -31,7 +31,7 @@ \u064b: ARABIC FATHATAN \u064d: ARABIC KASRATAN --> <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="keylabel_for_symbols_1">"١"</string> <string name="keylabel_for_symbols_2">"٢"</string> diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index d539e0d82..17aeff7cc 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -39,5 +39,5 @@ <!-- 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_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> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index d88020952..8b4ff367e 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -37,7 +37,7 @@ <!-- 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_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" --> <integer name="log_screen_metrics">2</integer> </resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index bc1bb0801..734004f5a 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -22,9 +22,9 @@ <attr name="latinKeyboardStyle" format="reference" /> <!-- KeyboardView style --> <attr name="keyboardViewStyle" format="reference" /> - <!-- PopupMiniKeyboardView style --> - <attr name="popupMiniKeyboardViewStyle" format="reference" /> - <attr name="popupMiniKeyboardPanelStyle" format="reference" /> + <!-- MiniKeyboardView style --> + <attr name="miniKeyboardViewStyle" format="reference" /> + <attr name="miniKeyboardPanelStyle" format="reference" /> <!-- Suggestions strip style --> <attr name="suggestionsStripBackgroundStyle" format="reference" /> <attr name="suggestionBackgroundStyle" format="reference" /> @@ -95,7 +95,7 @@ <!-- Amount to offset the touch Y coordinate by, for bias correction. --> <attr name="verticalCorrection" format="dimension" /> - <!-- Layout resource for popup keyboards. --> + <!-- Layout resource for popup panel --> <attr name="popupLayout" format="reference" /> <attr name="shadowColor" format="color" /> @@ -153,8 +153,8 @@ <attr name="horizontalGap" format="dimension|fraction" /> <!-- Default vertical gap between rows of keys. --> <attr name="verticalGap" format="dimension|fraction" /> - <!-- Popup keyboard layout template --> - <attr name="popupKeyboardTemplate" format="reference" /> + <!-- Popup panel layout template --> + <attr name="popupTemplate" format="reference" /> <!-- Locale of the keyboard layout --> <attr name="keyboardLocale" format="string" /> <!-- True if the keyboard is Right-To-Left --> @@ -180,8 +180,8 @@ <attr name="code" format="integer" /> <!-- The characters to display in the popup keyboard. --> <attr name="popupCharacters" format="string" /> - <!-- Maximum column of popup keyboard --> - <attr name="maxPopupKeyboardColumn" format="integer" /> + <!-- Maximum column of mini keyboard --> + <attr name="maxMiniKeyboardColumn" format="integer" /> <!-- Whether this is a functional key which has different key top than normal key. --> <attr name="isFunctional" format="boolean" /> <!-- Whether this is a toggle key. --> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 1c7c1a172..28cbc9549 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -67,7 +67,7 @@ <!-- 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_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"> <!-- Off, When auto correction setting is Off, this value is not used. --> <item></item> diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml index acd4b3725..acbf7dfae 100644 --- a/java/res/values/donottranslate-altchars.xml +++ b/java/res/values/donottranslate-altchars.xml @@ -51,7 +51,7 @@ <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_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@"</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="keylabel_for_popular_domain">".com"</string> <!-- popular web domains for the locale - most popular, displayed on the keyboard --> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 7936f3c3c..eb5b749dd 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -21,12 +21,12 @@ <item name="keyboardHeight">@dimen/keyboardHeight</item> <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</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="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item> <item name="horizontalGap">@fraction/key_horizontal_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 name="LatinKeyboard"> <item name="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled @@ -61,20 +61,20 @@ <item name="keyPreviewOffset">@dimen/key_preview_offset</item> <item name="keyPreviewHeight">@dimen/key_preview_height</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="shadowColor">#BB000000</item> <item name="shadowRadius">2.75</item> <item name="backgroundDimAmount">0.5</item> </style> <style - name="PopupMiniKeyboardView" + name="MiniKeyboardView" parent="KeyboardView" > <item name="keyBackground">@drawable/btn_keyboard_key_popup</item> <item name="verticalCorrection">@dimen/mini_keyboard_vertical_correction</item> </style> - <style name="PopupMiniKeyboardPanelStyle"> + <style name="MiniKeyboardPanelStyle"> <item name="android:background">@drawable/keyboard_popup_panel_background</item> <item name="android:paddingLeft">@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> </style> <style - name="PopupMiniKeyboardView.Stone" - parent="PopupMiniKeyboardView" + name="MiniKeyboardView.Stone" + parent="MiniKeyboardView" > <item name="keyBackground">@drawable/btn_keyboard_key_stone</item> <item name="keyTextColor">#FF000000</item> @@ -170,8 +170,8 @@ <item name="keyTextStyle">bold</item> </style> <style - name="PopupMiniKeyboardView.Gingerbread" - parent="PopupMiniKeyboardView" + name="MiniKeyboardView.Gingerbread" + parent="MiniKeyboardView" > <item name="android:background">@null</item> </style> @@ -213,13 +213,13 @@ <item name="shadowRadius">0.0</item> </style> <style - name="PopupMiniKeyboardView.IceCreamSandwich" - parent="PopupMiniKeyboardView" + name="MiniKeyboardView.IceCreamSandwich" + parent="MiniKeyboardView" > <item name="android:background">@null</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> </style> - <style name="PopupMiniKeyboardPanelStyle.IceCreamSandwich"> + <style name="MiniKeyboardPanelStyle.IceCreamSandwich"> <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:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding_ics</item> @@ -232,7 +232,7 @@ </style> <style name="SuggestionPreviewBackgroundStyle.IceCreamSandwich" - parent="PopupMiniKeyboardPanelStyle.IceCreamSandwich" + parent="MiniKeyboardPanelStyle.IceCreamSandwich" > </style> <style @@ -246,7 +246,7 @@ <item name="candidateCountInStrip">@integer/candidate_count_in_strip</item> <item name="centerCandidatePercentile">@integer/center_candidate_percentile</item> </style> - <style name="PopupMiniKeyboardAnimation"> + <style name="MiniKeyboardAnimation"> <item name="android:windowEnterAnimation">@anim/mini_keyboard_fadein</item> <item name="android:windowExitAnimation">@anim/mini_keyboard_fadeout</item> </style> diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml index 820f96216..17c06a278 100644 --- a/java/res/values/themes-basic-highcontrast.xml +++ b/java/res/values/themes-basic-highcontrast.xml @@ -19,8 +19,8 @@ <item name="keyboardStyle">@style/Keyboard</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="keyboardViewStyle">@style/KeyboardView.HighContrast</item> - <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView</item> - <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> + <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item> + <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml index 18cae4e24..23c71bd6f 100644 --- a/java/res/values/themes-basic.xml +++ b/java/res/values/themes-basic.xml @@ -19,8 +19,8 @@ <item name="keyboardStyle">@style/Keyboard</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="keyboardViewStyle">@style/KeyboardView</item> - <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView</item> - <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> + <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item> + <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 60f226153..1e3419f8c 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -19,8 +19,8 @@ <item name="keyboardStyle">@style/Keyboard.Gingerbread</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item> - <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Gingerbread</item> - <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> + <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Gingerbread</item> + <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 97c594408..7fa879cad 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -19,8 +19,8 @@ <item name="keyboardStyle">@style/Keyboard.IceCreamSandwich</item> <item name="latinKeyboardStyle">@style/LatinKeyboard.IceCreamSandwich</item> <item name="keyboardViewStyle">@style/KeyboardView.IceCreamSandwich</item> - <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.IceCreamSandwich</item> - <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle.IceCreamSandwich</item> + <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.IceCreamSandwich</item> + <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle.IceCreamSandwich</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item> diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml index d33e6bf35..fa2ee2dfd 100644 --- a/java/res/values/themes-stone-bold.xml +++ b/java/res/values/themes-stone-bold.xml @@ -19,8 +19,8 @@ <item name="keyboardStyle">@style/Keyboard.Stone</item> <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item> <item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item> - <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Stone</item> - <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> + <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item> + <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml index 230b2ca4d..494bae600 100644 --- a/java/res/values/themes-stone.xml +++ b/java/res/values/themes-stone.xml @@ -19,8 +19,8 @@ <item name="keyboardStyle">@style/Keyboard.Stone</item> <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item> <item name="keyboardViewStyle">@style/KeyboardView.Stone</item> - <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Stone</item> - <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item> + <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item> + <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index b93d3007f..43b6623a9 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -73,7 +73,7 @@ latin:keyOutputText=":-) " latin:keyLabelOption="hasPopupHint" latin:popupCharacters="@string/alternates_for_smiley" - latin:maxPopupKeyboardColumn="5" /> + latin:maxMiniKeyboardColumn="5" /> <key-style latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml index 7c74bb5ad..52ee91a37 100644 --- a/java/res/xml-sw768dp/kbd_key_styles.xml +++ b/java/res/xml-sw768dp/kbd_key_styles.xml @@ -55,7 +55,7 @@ latin:keyOutputText=":-) " latin:keyLabelOption="hasPopupHint" latin:popupCharacters="@string/alternates_for_smiley" - latin:maxPopupKeyboardColumn="5" /> + latin:maxMiniKeyboardColumn="5" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 48468987e..86f0bf24b 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -91,7 +91,7 @@ latin:keyOutputText=":-) " latin:keyLabelOption="hasPopupHint" latin:popupCharacters="@string/alternates_for_smiley" - latin:maxPopupKeyboardColumn="5" + latin:maxMiniKeyboardColumn="5" latin:parentStyle="functionalKeyStyle" /> </case> <case @@ -221,6 +221,6 @@ latin:keyHintLabel="@string/keyhintlabel_for_punctuation" latin:keyLabelOption="hasPopupHint" 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" /> </merge> diff --git a/java/res/xml/kbd_popup_template.xml b/java/res/xml/kbd_mini_keyboard_template.xml index 79db081a1..79db081a1 100644 --- a/java/res/xml/kbd_popup_template.xml +++ b/java/res/xml/kbd_mini_keyboard_template.xml diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml index 75e21a002..5880d52c7 100644 --- a/java/res/xml/kbd_rows_symbols.xml +++ b/java/res/xml/kbd_rows_symbols.xml @@ -106,7 +106,7 @@ <Key latin:keyLabel=""" latin:popupCharacters="“,”,«,»" - latin:maxPopupKeyboardColumn="6" /> + latin:maxMiniKeyboardColumn="6" /> <Key latin:keyLabel="\'" latin:popupCharacters="‘,’,‚,‛" /> |