aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/xml')
-rw-r--r--java/res/xml/key_f1.xml6
-rw-r--r--java/res/xml/key_styles_common.xml6
-rw-r--r--java/res/xml/key_styles_enter.xml15
-rw-r--r--java/res/xml/key_styles_less_greater.xml (renamed from java/res/xml/keys_less_greater.xml)14
-rw-r--r--java/res/xml/key_styles_settings.xml (renamed from java/res/xml/key_styles_f1.xml)6
-rw-r--r--java/res/xml/keys_comma_period_symbols.xml30
-rw-r--r--java/res/xml/prefs.xml7
-rw-r--r--java/res/xml/prefs_for_debug.xml27
-rw-r--r--java/res/xml/row_dvorak4.xml2
-rw-r--r--java/res/xml/row_symbols4.xml12
-rw-r--r--java/res/xml/row_symbols_shift4.xml15
11 files changed, 60 insertions, 80 deletions
diff --git a/java/res/xml/key_f1.xml b/java/res/xml/key_f1.xml
index 3471c85f5..7bd7385a1 100644
--- a/java/res/xml/key_f1.xml
+++ b/java/res/xml/key_f1.xml
@@ -27,20 +27,20 @@
>
<Key
latin:keySpec="/"
- latin:keyStyle="f1MoreKeysStyle" />
+ latin:keyStyle="settingsMoreKeysStyle" />
</case>
<case
latin:mode="email"
>
<Key
latin:keySpec="\@"
- latin:keyStyle="f1MoreKeysStyle" />
+ latin:keyStyle="settingsMoreKeysStyle" />
</case>
<default>
<Key
latin:keySpec="!text/keyspec_comma"
latin:keyLabelFlags="hasPopupHint"
- latin:keyStyle="f1MoreKeysStyle" />
+ latin:keyStyle="settingsMoreKeysStyle" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 9d5d52e16..8b3bb2e5c 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -35,9 +35,9 @@
latin:keyLabelFlags="hasShiftedLetterHint" />
</default>
</switch>
- <!-- Base key style for the key which may have settings or tab key as popup key. -->
+ <!-- Base key style for the key which may have settings key as more keys. -->
<include
- latin:keyboardLayout="@xml/key_styles_f1" />
+ latin:keyboardLayout="@xml/key_styles_settings" />
<!-- Functional key styles -->
<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
<key-style
@@ -104,7 +104,7 @@
latin:keyIconDisabled="!icon/shortcut_key_disabled"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="!code/key_space"
- latin:parentStyle="f1MoreKeysStyle" />
+ latin:parentStyle="settingsMoreKeysStyle" />
<key-style
latin:styleName="settingsKeyStyle"
latin:keySpec="!icon/settings_key|!code/key_settings"
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 1a60bcce8..50530e1bf 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -298,7 +298,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_go_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -317,7 +316,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_next_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -336,7 +334,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_previous_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -355,7 +352,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_done_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -374,11 +370,11 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_send_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
+ latin:isIconDefined="search_key"
>
<key-style
latin:styleName="enterKeyStyle"
@@ -387,13 +383,20 @@
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
+ latin:imeAction="actionSearch"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keySpec="!text/label_search_key|!code/key_enter"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </case>
+ <case
latin:imeAction="actionCustomLabel"
>
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="dummy_label|!code/key_enter"
latin:keyLabelFlags="fromCustomActionLabel"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<!-- imeAction is either actionNone or actionUnspecified. -->
diff --git a/java/res/xml/keys_less_greater.xml b/java/res/xml/key_styles_less_greater.xml
index 778de02a1..db4c7984b 100644
--- a/java/res/xml/keys_less_greater.xml
+++ b/java/res/xml/key_styles_less_greater.xml
@@ -21,25 +21,31 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <!-- The less and greater keys' style which may have different label depending on locale. -->
+ <!-- Kept as a separate file for cleaner overriding by an overlay. -->
<switch>
<case
latin:languageCode="fa"
>
- <Key
+ <key-style
+ latin:styleName="lessKeyStyle"
latin:keySpec="!text/keyspec_left_double_angle_quote"
latin:backgroundType="functional"
latin:moreKeys="!text/morekeys_less_than" />
- <Key
+ <key-style
+ latin:styleName="greaterKeyStyle"
latin:keySpec="!text/keyspec_right_double_angle_quote"
latin:backgroundType="functional"
latin:moreKeys="!text/morekeys_greater_than" />
</case>
<default>
- <Key
+ <key-style
+ latin:styleName="lessKeyStyle"
latin:keySpec="!text/keyspec_less_than"
latin:backgroundType="functional"
latin:moreKeys="!text/morekeys_less_than" />
- <Key
+ <key-style
+ latin:styleName="greaterKeyStyle"
latin:keySpec="!text/keyspec_greater_than"
latin:backgroundType="functional"
latin:moreKeys="!text/morekeys_greater_than" />
diff --git a/java/res/xml/key_styles_f1.xml b/java/res/xml/key_styles_settings.xml
index 8a07827fa..956b40235 100644
--- a/java/res/xml/key_styles_f1.xml
+++ b/java/res/xml/key_styles_settings.xml
@@ -21,20 +21,20 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- Base key style for the key which may have settings or tab key as popup key. -->
+ <!-- Base key style for the key which may have settings key as more keys. -->
<!-- Kept as a separate file for cleaner overriding by an overlay. -->
<switch>
<case
latin:clobberSettingsKey="true"
>
<key-style
- latin:styleName="f1MoreKeysStyle"
+ latin:styleName="settingsMoreKeysStyle"
latin:backgroundType="functional" />
</case>
<!-- clobberSettingsKey="false" -->
<default>
<key-style
- latin:styleName="f1MoreKeysStyle"
+ latin:styleName="settingsMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/keyspec_settings"
latin:backgroundType="functional" />
diff --git a/java/res/xml/keys_comma_period_symbols.xml b/java/res/xml/keys_comma_period_symbols.xml
deleted file mode 100644
index 843595c27..000000000
--- a/java/res/xml/keys_comma_period_symbols.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, 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.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <Key
- latin:keySpec="!text/keyspec_comma" />
- <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
- <Key
- latin:keySpec="."
- latin:moreKeys="&#x2026;" />
-</merge>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 61ebb6992..0e9c16190 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -95,6 +95,12 @@
android:summary="@string/use_personalized_dicts_summary"
android:persistent="true"
android:defaultValue="true" />
+ <!-- title will be set programmatically to embed application name -->
+ <CheckBoxPreference
+ android:key="pref_enable_metrics_logging"
+ android:summary="@string/enable_metrics_logging_summary"
+ android:persistent="true"
+ android:defaultValue="true" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/gesture_typing_category"
@@ -153,6 +159,7 @@
android:defaultValue="true" />
<CheckBoxPreference
android:key="pref_include_other_imes_in_language_switch_list"
+ android:dependency="pref_show_language_switch_key"
android:title="@string/include_other_imes_in_language_switch_list"
android:summary="@string/include_other_imes_in_language_switch_list_summary"
android:persistent="true"
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml
index c333b0751..0bcc5cbe4 100644
--- a/java/res/xml/prefs_for_debug.xml
+++ b/java/res/xml/prefs_for_debug.xml
@@ -21,12 +21,6 @@
android:key="english_ime_debug_settings"
>
<CheckBoxPreference
- android:key="enable_logging"
- android:title="@string/prefs_enable_log"
- android:summary="@string/prefs_description_log"
- android:persistent="true"
- android:defaultValue="false" />
- <CheckBoxPreference
android:key="debug_mode"
android:title="@string/prefs_debug_mode"
android:persistent="true"
@@ -37,11 +31,6 @@
android:persistent="true"
android:defaultValue="false" />
<CheckBoxPreference
- android:key="usability_study_mode"
- android:title="@string/prefs_usability_study_mode"
- android:persistent="true"
- android:defaultValue="false" />
- <CheckBoxPreference
android:key="pref_sliding_key_input_preview"
android:title="@string/sliding_key_input_preview"
android:summary="@string/sliding_key_input_preview_summary"
@@ -72,16 +61,8 @@
<PreferenceScreen
android:key="read_external_dictionary"
android:title="@string/prefs_read_external_dictionary" />
- <PreferenceScreen
- android:key="dump_contacts_dict"
- android:title="@string/prefs_dump_contacts_dict" />
- <PreferenceScreen
- android:key="dump_user_dict"
- android:title="@string/prefs_dump_user_dict" />
- <PreferenceScreen
- android:key="dump_user_history_dict"
- android:title="@string/prefs_dump_user_history_dict" />
- <PreferenceScreen
- android:key="dump_personalization_dict"
- android:title="@string/prefs_dump_personalization_dict" />
+ <PreferenceCategory
+ android:key="pref_key_dump_dictionaries"
+ android:title="@string/prefs_dump_dynamic_dicts">
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml
index 279f64627..e7a3ee736 100644
--- a/java/res/xml/row_dvorak4.xml
+++ b/java/res/xml/row_dvorak4.xml
@@ -30,7 +30,7 @@
<Key
latin:keySpec="q"
latin:backgroundType="normal"
- latin:keyStyle="f1MoreKeysStyle" />
+ latin:keyStyle="settingsMoreKeysStyle" />
<include
latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space_5kw" />
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index 09f6b628c..2be03bd6d 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -20,11 +20,15 @@
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
<Key
- latin:keySpec="_" />
+ latin:keySpec="!text/keyspec_comma" />
<Key
- latin:keySpec="/" />
+ latin:keySpec="_" />
<include
latin:keyboardLayout="@xml/key_space_symbols" />
- <include
- latin:keyboardLayout="@xml/keys_comma_period_symbols" />
+ <Key
+ latin:keySpec="/" />
+ <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+ <Key
+ latin:keySpec="."
+ latin:moreKeys="&#x2026;" />
</merge>
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index f75575bc6..4fc63c2c5 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -18,9 +18,18 @@
*/
-->
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
-
- <include latin:keyboardLayout="@xml/keys_less_greater" />
+ <include
+ latin:keyboardLayout="@xml/key_styles_less_greater" />
+ <Key
+ latin:keySpec="!text/keyspec_comma" />
+ <Key
+ latin:keyStyle="lessKeyStyle" />
<include
latin:keyboardLayout="@xml/key_space_symbols" />
- <include latin:keyboardLayout="@xml/keys_comma_period_symbols" />
+ <Key
+ latin:keyStyle="greaterKeyStyle" />
+ <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+ <Key
+ latin:keySpec="."
+ latin:moreKeys="&#x2026;" />
</merge>
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-31 18:07:32 +0000