diff options
Diffstat (limited to 'java/res')
18 files changed, 20 insertions, 10 deletions
diff --git a/java/res/drawable-xlarge-land/key_hint_at_large_holo.9.png b/java/res/drawable-xlarge-land/key_hint_at_large_holo.9.png Binary files differnew file mode 100644 index 000000000..eaad0664c --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_at_large_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_colon_large_holo.9.png b/java/res/drawable-xlarge-land/key_hint_colon_large_holo.9.png Binary files differnew file mode 100644 index 000000000..bdf4ed574 --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_colon_large_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_exclamation_large_holo.9.png b/java/res/drawable-xlarge-land/key_hint_exclamation_large_holo.9.png Binary files differnew file mode 100644 index 000000000..6511822ab --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_exclamation_large_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_plus_large_holo.9.png b/java/res/drawable-xlarge-land/key_hint_plus_large_holo.9.png Binary files differnew file mode 100644 index 000000000..206d99073 --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_plus_large_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_question_large_holo.9.png b/java/res/drawable-xlarge-land/key_hint_question_large_holo.9.png Binary files differnew file mode 100644 index 000000000..d205ef83d --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_question_large_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_quote_large_holo.9.png b/java/res/drawable-xlarge-land/key_hint_quote_large_holo.9.png Binary files differnew file mode 100644 index 000000000..074d619c9 --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_quote_large_holo.9.png diff --git a/java/res/drawable-xlarge-land/key_hint_slash_large_holo.9.png b/java/res/drawable-xlarge-land/key_hint_slash_large_holo.9.png Binary files differnew file mode 100644 index 000000000..a3a02973c --- /dev/null +++ b/java/res/drawable-xlarge-land/key_hint_slash_large_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_at_large_holo.9.png b/java/res/drawable-xlarge/key_hint_at_large_holo.9.png Binary files differnew file mode 100644 index 000000000..ff56845f8 --- /dev/null +++ b/java/res/drawable-xlarge/key_hint_at_large_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_colon_large_holo.9.png b/java/res/drawable-xlarge/key_hint_colon_large_holo.9.png Binary files differnew file mode 100644 index 000000000..91e788323 --- /dev/null +++ b/java/res/drawable-xlarge/key_hint_colon_large_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_exclamation_large_holo.9.png b/java/res/drawable-xlarge/key_hint_exclamation_large_holo.9.png Binary files differnew file mode 100644 index 000000000..0152ce21b --- /dev/null +++ b/java/res/drawable-xlarge/key_hint_exclamation_large_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_plus_large_holo.9.png b/java/res/drawable-xlarge/key_hint_plus_large_holo.9.png Binary files differnew file mode 100644 index 000000000..5f7d31563 --- /dev/null +++ b/java/res/drawable-xlarge/key_hint_plus_large_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_question_large_holo.9.png b/java/res/drawable-xlarge/key_hint_question_large_holo.9.png Binary files differnew file mode 100644 index 000000000..8a9dffbe2 --- /dev/null +++ b/java/res/drawable-xlarge/key_hint_question_large_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_quote_large_holo.9.png b/java/res/drawable-xlarge/key_hint_quote_large_holo.9.png Binary files differnew file mode 100644 index 000000000..6514e0bf7 --- /dev/null +++ b/java/res/drawable-xlarge/key_hint_quote_large_holo.9.png diff --git a/java/res/drawable-xlarge/key_hint_slash_large_holo.9.png b/java/res/drawable-xlarge/key_hint_slash_large_holo.9.png Binary files differnew file mode 100644 index 000000000..75c3bb1a6 --- /dev/null +++ b/java/res/drawable-xlarge/key_hint_slash_large_holo.9.png diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 72e3f0dd0..815c7fd28 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -106,12 +106,15 @@ <attr name="keyOutputText" format="string" /> <!-- The label to display on the key. --> <attr name="keyLabel" format="string" /> - <!-- The label to display on the key when keyboard is in temporary shift mode. --> - <attr name="temporaryShiftKeyLabel" format="string" /> + <!-- The unicode that this key generates in manual temporary upper case mode. --> + <attr name="manualTemporaryUpperCaseCode" format="integer" /> <!-- The icon to display on the key instead of the label. --> <attr name="keyIcon" format="reference" /> <!-- The hint icon to display on the key in conjunction with the label --> <attr name="keyHintIcon" format="reference" /> + <!-- The hint icon to display on the key when keyboard is in manual temporary upper case + mode. --> + <attr name="manualTemporaryUpperCaseHintIcon" format="reference" /> </declare-styleable> <declare-styleable name="BaseKeyboard_Row"> diff --git a/java/res/xml-xlarge/kbd_qwerty_row2.xml b/java/res/xml-xlarge/kbd_qwerty_row2.xml index 96077306f..71aa916c7 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row2.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row2.xml @@ -66,8 +66,9 @@ <default> <Key latin:keyLabel="\'" - latin:temporaryShiftKeyLabel=""" + latin:manualTemporaryUpperCaseCode="34" latin:keyHintIcon="@drawable/key_hint_quote_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters=""" /> </default> diff --git a/java/res/xml-xlarge/kbd_qwerty_row3.xml b/java/res/xml-xlarge/kbd_qwerty_row3.xml index 77a4d4815..24d1b1db9 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row3.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row3.xml @@ -64,14 +64,16 @@ <default> <Key latin:keyLabel="," - latin:temporaryShiftKeyLabel="!" + latin:manualTemporaryUpperCaseCode="33" latin:keyHintIcon="@drawable/key_hint_exclamation_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="!" /> <Key latin:keyLabel="." - latin:temporaryShiftKeyLabel="\?" + latin:manualTemporaryUpperCaseCode="63" latin:keyHintIcon="@drawable/key_hint_question_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\?" /> </default> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml index 4aae16d6d..63b5c2c6a 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml @@ -55,10 +55,11 @@ latin:popupKeyboard="@xml/popup_smileys" /> <Key latin:keyLabel="=" - latin:temporaryShiftKeyLabel="+" + latin:manualTemporaryUpperCaseCode="43" latin:keyHintIcon="@drawable/key_hint_plus_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo" latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters=">" /> + latin:popupCharacters="+" /> </default> </switch> <Key @@ -77,8 +78,9 @@ <default> <Key latin:keyLabel="-" - latin:temporaryShiftKeyLabel="/" + latin:manualTemporaryUpperCaseCode="47" latin:keyHintIcon="@drawable/key_hint_slash_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_slash_large_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="/" /> </default> @@ -95,16 +97,18 @@ > <Key latin:keyLabel="_" - latin:temporaryShiftKeyLabel=":" + latin:manualTemporaryUpperCaseCode="58" latin:keyHintIcon="@drawable/key_hint_colon_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters=":" /> </case> <default> <Key latin:keyLabel="_" - latin:temporaryShiftKeyLabel="\@" + latin:manualTemporaryUpperCaseCode="64" latin:keyHintIcon="@drawable/key_hint_at_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\@" /> </default> |