diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout-xlarge/candidates.xml | 7 | ||||
| -rw-r--r-- | java/res/layout/candidates.xml | 5 | ||||
| -rw-r--r-- | java/res/values-fr/donottranslate-altchars.xml | 10 | ||||
| -rw-r--r-- | java/res/values-hdpi/config.xml | 24 | ||||
| -rw-r--r-- | java/res/values-xlarge/config.xml | 2 | ||||
| -rw-r--r-- | java/res/values/config.xml | 4 |
6 files changed, 41 insertions, 11 deletions
diff --git a/java/res/layout-xlarge/candidates.xml b/java/res/layout-xlarge/candidates.xml index 9d6cd241c..096a0adf1 100644 --- a/java/res/layout-xlarge/candidates.xml +++ b/java/res/layout-xlarge/candidates.xml @@ -32,14 +32,14 @@ <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="@dimen/candidate_strip_height" + android:layout_height="wrap_content" android:background="@drawable/keyboard_suggest_strip_holo" android:paddingRight="@dimen/candidate_strip_padding" android:paddingLeft="@dimen/candidate_strip_padding" > <HorizontalScrollView android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/candidate_strip_fading_edge_length" android:scrollbars="none" @@ -47,7 +47,8 @@ <com.android.inputmethod.latin.CandidateView android:id="@+id/candidates" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="@dimen/candidate_strip_height" + android:gravity="center_vertical" /> </HorizontalScrollView> </LinearLayout> </LinearLayout> diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml index 39e39a1b7..3d91c1d20 100644 --- a/java/res/layout/candidates.xml +++ b/java/res/layout/candidates.xml @@ -30,7 +30,7 @@ > <HorizontalScrollView android:layout_width="match_parent" - android:layout_height="@dimen/candidate_strip_height" + android:layout_height="wrap_content" android:background="@drawable/keyboard_suggest_strip" android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/candidate_strip_fading_edge_length" @@ -39,6 +39,7 @@ <com.android.inputmethod.latin.CandidateView android:id="@+id/candidates" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="@dimen/candidate_strip_height" + android:gravity="center_vertical" /> </HorizontalScrollView> </LinearLayout> diff --git a/java/res/values-fr/donottranslate-altchars.xml b/java/res/values-fr/donottranslate-altchars.xml index e01f63f14..ae9292f91 100644 --- a/java/res/values-fr/donottranslate-altchars.xml +++ b/java/res/values-fr/donottranslate-altchars.xml @@ -18,11 +18,11 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">1,à,â,æ,á,ä,ã,å,ā,ª</string> - <string name="alternates_for_e">3,é,è,ê,ë,ę,ė,ē</string> - <string name="alternates_for_i">8,î,ï,ì,í,į,ī</string> - <string name="alternates_for_o">9,ô,œ,ö,ò,ó,õ,ø,ō,º</string> - <string name="alternates_for_u">7,û,ù,ü,ú,ū</string> + <string name="alternates_for_a">à,â,1,æ,á,ä,ã,å,ā,ª</string> + <string name="alternates_for_e">é,è,ê,ë,3,ę,ė,ē</string> + <string name="alternates_for_i">î,8,ï,ì,í,į,ī</string> + <string name="alternates_for_o">ô,œ,9,ö,ò,ó,õ,ø,ō,º</string> + <string name="alternates_for_u">ù,û,7,ü,ú,ū</string> <string name="alternates_for_c">ç,ć,č</string> <string name="alternates_for_y">6,ÿ</string> <string name="alternates_for_q"></string> diff --git a/java/res/values-hdpi/config.xml b/java/res/values-hdpi/config.xml new file mode 100644 index 000000000..7333e9449 --- /dev/null +++ b/java/res/values-hdpi/config.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources> + <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> + <integer name="log_screen_metrics">1</integer> +</resources> diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml index ed8dc3e52..2c125dc7e 100644 --- a/java/res/values-xlarge/config.xml +++ b/java/res/values-xlarge/config.xml @@ -43,4 +43,6 @@ <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> + <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> + <integer name="log_screen_metrics">2</integer> </resources> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 32fb5bf1a..64e2c6753 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -63,7 +63,7 @@ <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">4</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string> - <integer name="config_max_popup_keyboard_column">10</integer> + <integer name="config_max_popup_keyboard_column">5</integer> <!-- Whether or not auto-correction should be enabled by default --> <bool name="enable_autocorrect">true</bool> <string-array name="auto_correction_threshold_values" translatable="false"> @@ -76,4 +76,6 @@ will be subject to auto-correction. --> <item>0</item> </string-array> + <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> + <integer name="log_screen_metrics">0</integer> </resources> |