diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 4 | ||||
| -rw-r--r-- | java/res/values/keypress-volumes.xml | 4 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_hebrew1.xml | 58 | ||||
| -rw-r--r-- | java/res/xml/rows_hebrew.xml | 13 |
7 files changed, 61 insertions, 23 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 80bf704db..c31831747 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -439,7 +439,6 @@ </declare-styleable> <declare-styleable name="SeekBarDialogPreference"> - <attr name="valueFormatText" format="reference" /> <attr name="maxValue" format="integer" /> <attr name="minValue" format="integer" /> <attr name="stepValue" format="integer" /> diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index e8d92256b..e2f2b56e5 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -56,7 +56,7 @@ <item>MODEL=XT907:MANUFACTURER=motorola,30</item> <!-- Sony Xperia Z --> <item>MODEL=C6603:MANUFACTURER=Sony,35</item> - <!-- Default value for unknown device --> - <item>,20</item> + <!-- Default value for unknown device. The negative value means system default. --> + <item>,-1</item> </string-array> </resources> diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml index a096c341b..d359055c2 100644 --- a/java/res/values/keypress-volumes.xml +++ b/java/res/values/keypress-volumes.xml @@ -26,7 +26,7 @@ <item>HARDWARE=grouper,0.3f</item> <item>HARDWARE=mako,0.3f</item> <item>HARDWARE=manta,0.2f</item> - <!-- Default value for unknown device --> - <item>,0.2f</item> + <!-- Default value for unknown device. The negative value means system default. --> + <item>,-1.0f</item> </string-array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 85abb08fe..cdc2c3a09 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -79,6 +79,8 @@ <!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] --> <string name="abbreviation_unit_milliseconds"><xliff:g id="milliseconds">%s</xliff:g>ms</string> + <!-- The text that represents the current settings value is the system default [CHAR LIMIT=20] --> + <string name="settings_system_default">System default</string> <!-- Option name for enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=25] --> <string name="use_contacts_dict">Suggest Contact names</string> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 51e3420e9..d77adcef9 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -170,14 +170,12 @@ <com.android.inputmethod.latin.SeekBarDialogPreference android:key="pref_key_longpress_timeout" android:title="@string/prefs_key_longpress_timeout_settings" - latin:valueFormatText="@string/abbreviation_unit_milliseconds" latin:minValue="@integer/config_min_longpress_timeout" latin:maxValue="@integer/config_max_longpress_timeout" latin:stepValue="@integer/config_longpress_timeout_step" /> <com.android.inputmethod.latin.SeekBarDialogPreference android:key="pref_vibration_duration_settings" android:title="@string/prefs_keypress_vibration_duration_settings" - latin:valueFormatText="@string/abbreviation_unit_milliseconds" latin:maxValue="@integer/config_max_vibration_duration" /> <com.android.inputmethod.latin.SeekBarDialogPreference android:key="pref_keypress_sound_volume" diff --git a/java/res/xml/rowkeys_hebrew1.xml b/java/res/xml/rowkeys_hebrew1.xml index 396da785e..81a00e367 100644 --- a/java/res/xml/rowkeys_hebrew1.xml +++ b/java/res/xml/rowkeys_hebrew1.xml @@ -21,28 +21,70 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <switch> + <case + latin:mode="email|url" + > + <Key + latin:keyLabel="-" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + <Key + latin:keyLabel="_" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" /> + </case> + <default> + <Key + latin:keyLabel="\'" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" + latin:moreKeys=""" /> + <Key + latin:keyLabel="-" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" + latin:moreKeys="_" /> + </default> + </switch> <!-- U+05E7: "ק" HEBREW LETTER QOF --> <Key - latin:keyLabel="ק" /> + latin:keyLabel="ק" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3" /> <!-- U+05E8: "ר" HEBREW LETTER RESH --> <Key - latin:keyLabel="ר" /> + latin:keyLabel="ר" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4" /> <!-- U+05D0: "א" HEBREW LETTER ALEF --> <Key - latin:keyLabel="א" /> + latin:keyLabel="א" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5" /> <!-- U+05D8: "ט" HEBREW LETTER TET --> <Key - latin:keyLabel="ט" /> + latin:keyLabel="ט" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6" /> <!-- U+05D5: "ו" HEBREW LETTER VAV --> <Key - latin:keyLabel="ו" /> + latin:keyLabel="ו" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7" /> <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN --> <Key - latin:keyLabel="ן" /> + latin:keyLabel="ן" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8" /> <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM --> <Key - latin:keyLabel="ם" /> + latin:keyLabel="ם" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" /> <!-- U+05E4: "פ" HEBREW LETTER PE --> <Key - latin:keyLabel="פ" /> + latin:keyLabel="פ" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> </merge> diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml index 2d513df65..f12380a7d 100644 --- a/java/res/xml/rows_hebrew.xml +++ b/java/res/xml/rows_hebrew.xml @@ -27,12 +27,7 @@ latin:keyWidth="10%p" > <include - latin:keyboardLayout="@xml/rowkeys_hebrew1" - latin:keyXPos="5%p" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" - latin:visualInsetsLeft="1%p" /> + latin:keyboardLayout="@xml/rowkeys_hebrew1" /> </Row> <Row latin:keyWidth="10%p" @@ -44,8 +39,10 @@ latin:keyWidth="10%p" > <include - latin:keyboardLayout="@xml/rowkeys_hebrew3" - latin:keyXPos="5%p" /> + latin:keyboardLayout="@xml/rowkeys_hebrew3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> |