diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-09-15 02:28:42 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-09-15 02:28:42 -0700 |
| commit | a1b68eb1269bb51df5143ceaf1c6d8a61e288a9c (patch) | |
| tree | 2ed2849760a33c18b64e82826a8e5af7cfdf929a /java/res/xml-sw600dp | |
| parent | 97ec205504a6a03faabe950f0100f11a764685da (diff) | |
| parent | 85c0ebddce385842d13830be033585c6ffc56523 (diff) | |
| download | latinime-a1b68eb1269bb51df5143ceaf1c6d8a61e288a9c.tar.gz latinime-a1b68eb1269bb51df5143ceaf1c6d8a61e288a9c.tar.xz latinime-a1b68eb1269bb51df5143ceaf1c6d8a61e288a9c.zip | |
Merge "Remove functionalKeyStyle, use backgroundType="functional" instead"
Diffstat (limited to 'java/res/xml-sw600dp')
| -rw-r--r-- | java/res/xml-sw600dp/kbd_key_styles.xml | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index dfc7409ad..d86a01dc1 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -21,10 +21,6 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- Base key style for the functional key --> - <key-style - latin:styleName="functionalKeyStyle" - latin:backgroundType="functional" /> <!-- Base key style for the key which may have settings key as popup key --> <switch> <case @@ -32,14 +28,14 @@ > <key-style latin:styleName="f2PopupStyle" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> </case> <default> <key-style latin:styleName="f2PopupStyle" latin:keyLabelOption="hasPopupHint" latin:moreKeys="\@icon/3|\@integer/key_settings" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> </default> </switch> <!-- Functional key styles --> @@ -48,19 +44,19 @@ latin:code="@integer/key_shift" latin:keyIcon="iconShiftKey" latin:keyIconShifted="iconShiftedShiftKey" - latin:parentStyle="functionalKeyStyle" + latin:backgroundType="functional" latin:isSticky="true" /> <key-style latin:styleName="deleteKeyStyle" latin:code="@integer/key_delete" latin:keyIcon="iconDeleteKey" - latin:parentStyle="functionalKeyStyle" + latin:backgroundType="functional" latin:isRepeatable="true" /> <key-style latin:styleName="returnKeyStyle" latin:code="@integer/key_return" latin:keyIcon="iconReturnKey" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> <key-style latin:styleName="spaceKeyStyle" latin:code="@integer/key_space" /> @@ -85,33 +81,33 @@ latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" latin:keyIconPreview="iconPreviewSettingsKey" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" latin:code="@integer/key_tab" latin:keyIcon="iconTabKey" latin:keyIconPreview="iconPreviewTabKey" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> <key-style latin:styleName="toSymbolKeyStyle" latin:code="@integer/key_switch_alpha_symbol" latin:keyLabel="@string/label_to_symbol_key" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> <key-style latin:styleName="toAlphaKeyStyle" latin:code="@integer/key_switch_alpha_symbol" latin:keyLabel="@string/label_to_alpha_key" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> <key-style latin:styleName="toMoreSymbolKeyStyle" latin:code="@integer/key_shift" latin:keyLabel="@string/label_to_more_symbol_for_tablet_key" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> <key-style latin:styleName="backFromMoreSymbolKeyStyle" latin:code="@integer/key_shift" latin:keyLabel="@string/label_to_symbol_key" - latin:parentStyle="functionalKeyStyle" /> + latin:backgroundType="functional" /> <key-style latin:styleName="comKeyStyle" latin:keyLabel="@string/keylabel_for_popular_domain" |