Add a new preference item to show/hide the settings key.
bug: 2998722
Change-Id: Iac1641c338388fd8f85e0cf47e31afdaeb34c0c0
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index fad3ebc..fbdead6 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -121,20 +121,40 @@
android:isRepeatable="true" android:isModifier="true"/>
</Row>
- <Row android:rowEdgeFlags="bottom">
+ <Row
+ android:keyboardMode="@+id/mode_symbols"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
+ android:keyWidth="20%p" android:keyEdgeFlags="left" android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:isModifier="true"/>
+ <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
+ android:keyWidth="40%p"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:isRepeatable="true" android:isModifier="true"/>
+ <Key android:codes="46" android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
+ <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:isModifier="true"/>
+ </Row>
+
+ <Row
+ android:keyboardMode="@+id/mode_symbols_with_settings_key"
+ android:rowEdgeFlags="bottom"
+ >
<Key android:codes="-2" android:keyLabel="@string/label_alpha_key"
android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
<Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyWidth="10%p" android:isModifier="true"/>
+ android:isModifier="true"/>
+ <Key android:codes="@integer/key_f1" android:isModifier="true"/>
<Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
android:keyWidth="30%p"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:isRepeatable="true" android:isModifier="true"/>
<Key android:codes="46" android:keyLabel="."
- android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
+ android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:isModifier="true"/>