Merge "Bring "comma" key back to symbol layout"

main
Tadashi G. Takaoka 2011-07-15 17:06:45 -07:00 committed by Android (Google) Code Review
commit 4fc4a7f567
2 changed files with 11 additions and 8 deletions

View File

@ -227,6 +227,14 @@
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
</default> </default>
</switch> </switch>
<key-style
latin:styleName="basePunctuationKeyStyle"
latin:keyLabel="."
latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="@integer/popup_keyboard_column_for_punctuation"
latin:parentStyle="functionalKeyStyle" />
<switch> <switch>
<case <case
latin:navigateAction="true" latin:navigateAction="true"
@ -242,12 +250,7 @@
<default> <default>
<key-style <key-style
latin:styleName="punctuationKeyStyle" latin:styleName="punctuationKeyStyle"
latin:keyLabel="." latin:parentStyle="basePunctuationKeyStyle" />
latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="@integer/popup_keyboard_column_for_punctuation"
latin:parentStyle="functionalKeyStyle" />
</default> </default>
</switch> </switch>
</merge> </merge>

View File

@ -42,7 +42,7 @@
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="35.83%p" /> latin:keyWidth="35.83%p" />
<Key <Key
latin:keyStyle="punctuationKeyStyle" latin:keyStyle="basePunctuationKeyStyle"
latin:keyWidth="9.2%p" /> latin:keyWidth="9.2%p" />
</case> </case>
<!-- latin:hasSettingsKey="false" --> <!-- latin:hasSettingsKey="false" -->
@ -57,7 +57,7 @@
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" /> latin:keyWidth="50%p" />
<Key <Key
latin:keyStyle="punctuationKeyStyle" /> latin:keyStyle="basePunctuationKeyStyle" />
</default> </default>
</switch> </switch>
<switch> <switch>