Replace large device keyboard with phone style keyboard (DO NOT MERGE)
This change also fixes copyright comments.
Bug: 4442045
Change-Id: I297a2c64e709fb0d613404e5f1de45d810f9de15
diff --git a/java/res/xml-large/kbd_symbols.xml b/java/res/xml-large/kbd_symbols.xml
index 1061178..3f79ae1 100644
--- a/java/res/xml-large/kbd_symbols.xml
+++ b/java/res/xml-large/kbd_symbols.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2010, The Android Open Source Project
+** Copyright 2011, 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.
@@ -23,6 +23,7 @@
latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p"
+ latin:keyWidth="10%p"
latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@@ -32,18 +33,13 @@
latin:keyboardLayout="@xml/kbd_key_styles" />
<include
latin:keyboardLayout="@xml/kbd_currency_key_styles" />
- <!-- This row is intentionally not marked as a top row -->
<Row
- latin:keyWidth="8.272%p"
+ latin:rowEdgeFlags="top"
>
<Key
- latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="7.949%p"
- latin:keyEdgeFlags="left" />
- <Key
latin:keyLabel="1"
- latin:popupCharacters="¹,½,⅓,¼,⅛" />
+ latin:popupCharacters="¹,½,⅓,¼,⅛"
+ latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="2"
latin:popupCharacters="²,⅔" />
@@ -67,22 +63,15 @@
latin:keyLabel="9" />
<Key
latin:keyLabel="0"
- latin:popupCharacters="ⁿ,∅" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="9.331%p"
+ latin:popupCharacters="ⁿ,∅"
latin:keyEdgeFlags="right" />
</Row>
- <Row
- latin:keyWidth="8.157%p"
- >
+ <Row>
<Key
- latin:keyStyle="toAlphaKeyStyle"
- latin:keyLabelOption="alignLeft"
- latin:keyWidth="11.167%p"
+ latin:keyLabel="\@"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="#" />
+ latin:keyLabel="\#" />
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
@@ -104,127 +93,39 @@
latin:popupCharacters="[,{,<" />
<Key
latin:keyLabel=")"
- latin:popupCharacters="],},>" />
- <Key
- latin:keyStyle="returnKeyStyle"
- latin:keyWidth="15.750%p"
+ latin:popupCharacters="],},>"
latin:keyEdgeFlags="right" />
</Row>
- <Row
- latin:keyWidth="8.042%p"
- >
+ <Row>
<Key
- latin:keyStyle="moreKeyStyle"
- latin:keyWidth="15.192%p"
+ latin:keyStyle="altKeyStyle"
+ latin:keyWidth="15%p"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="<"
- latin:popupCharacters="≤,«,‹" />
+ latin:keyLabel="!"
+ latin:popupCharacters="¡" />
+ <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
+ <!-- latin:popupCharacters="“,”,„,‟,«,»" -->
<Key
- latin:keyLabel=">"
- latin:popupCharacters="≥,»,›" />
+ latin:keyLabel="""
+ latin:popupCharacters="“,”,«,»"
+ latin:maxPopupKeyboardColumn="6" />
<Key
- latin:keyLabel="="
- latin:popupCharacters="≠,≈" />
- <switch>
- <case
- latin:languageCode="ru"
- >
- <Key
- latin:keyLabel=":" />
- </case>
- <case
- latin:mode="url"
- >
- <Key
- latin:keyLabel="\'" />
- </case>
- <default>
- <Key
- latin:keyLabel=":" />
- </default>
- </switch>
+ latin:keyLabel="\'"
+ latin:popupCharacters="‘,’,‚,‛" />
+ <Key
+ latin:keyLabel=":" />
<Key
latin:keyLabel=";" />
- <switch>
- <case
- latin:languageCode="ru"
- >
- <Key
- latin:keyLabel="\'" />
- <Key
- latin:keyLabel="""
- latin:popupCharacters="“,”,«,»,˝" />
- <Key
- latin:keyLabel="." />
- <Key
- latin:keyLabel="," />
- </case>
- <default>
- <Key
- latin:keyLabel="," />
- <Key
- latin:keyLabel="." />
- <Key
- latin:keyLabel="!"
- latin:popupCharacters="¡" />
- <Key
- latin:keyLabel="\?"
- latin:popupCharacters="¿" />
- </default>
- </switch>
- <Key
- latin:keyStyle="moreKeyStyle"
- latin:keyWidth="12.530%p"
- latin:keyEdgeFlags="right" />
- </Row>
- <!-- This row is intentionally not marked as a bottom row -->
- <Row
- latin:keyWidth="8.042%p"
- >
- <Spacer
- latin:horizontalGap="8.362%p" />
- <switch>
- <case latin:hasSettingsKey="true">
- <Key
- latin:keyStyle="settingsKeyStyle" />
- </case>
- <default>
- <Spacer
- latin:horizontalGap="8.042%p" />
- </default>
- </switch>
<Key
latin:keyLabel="/" />
<Key
- latin:keyLabel="\@" />
+ latin:keyLabel="\?"
+ latin:popupCharacters="¿" />
<Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="37.454%p" />
- <switch>
- <case
- latin:languageCode="ru"
- >
- <Key
- latin:keyLabel="_" />
- <Key
- latin:keyLabel="-" />
- </case>
- <default>
- <Key
- latin:keyLabel="""
- latin:popupCharacters="“,”,«,»,˝" />
- <Key
- latin:keyLabel="_" />
- </default>
- </switch>
- <switch>
- <case
- latin:voiceKeyEnabled="true"
- >
- <Key
- latin:keyStyle="micKeyStyle" />
- </case>
- </switch>
+ latin:keyStyle="deleteKeyStyle"
+ latin:keyWidth="15%p"
+ latin:keyEdgeFlags="right" />
</Row>
+ <include latin:keyboardLayout="@xml/kbd_symbols_row4" />
</Keyboard>