commit cd96a691b14b384face577d907f6c1aa33b47233
author Tadashi G. Takaoka <takaoka@google.com> Thu Jun 23 21:55:56 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Jun 24 00:08:42 2011 +0900
tree bcf1f2646570a78150311dad3bd97fdf35624bd0
parent 75d7fb66751cb39e7e4f17ad88b3190206e8aaac

Fix "Show settings key" option on 7" device

Cherry-pic I993ac772 from Honeycomb-MR2.

Bug: 4586882
Change-Id: Ie74138523a3ae7958c7bec674c49aa0ab1a72d05

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 5c00510..e9b6354 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -277,6 +277,14 @@
         <attr name="navigateAction" format="boolean" />
         <attr name="passwordInput" format="boolean" />
         <attr name="hasSettingsKey" format="boolean" />
+        <!-- This should be aligned with KeyboardID.F2KEY_MODE_* -->
+        <attr name="f2KeyMode" format="enum">
+            <enum name="none" value="0" />
+            <enum name="settings" value="1" />
+            <enum name="shortcutIme" value="2" />
+            <enum name="shortcutImeOrSettings" value="3" />
+        </attr>
+        <attr name="clobberSettingsKey" format="boolean" />
         <attr name="voiceKeyEnabled" format="boolean" />
         <attr name="hasVoiceKey" format="boolean" />
         <attr name="imeAction" format="enum">