commit 59c9930ca98f68aeb6b0b9dc19e29666b8fb152a
author Tadashi G. Takaoka <takaoka@google.com> Sun Nov 21 16:40:38 2010 -0800
committer Tadashi G. Takaoka <takaoka@google.com> Tue Nov 23 18:07:27 2010 -0800
tree 38455864d41d3ecacbb43c4f7681d3f5ef612928
parent a963d0b2e4f1dbe011df383394329d3f95d1d728

Support colorScheme <case/> condition in Keyboard XML

Change-Id: Ibbfb99e0e2b15df301f83af6739b7bca01ebf490

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 5f29af2..24c9855 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -57,14 +57,15 @@
         <attr name="backgroundDimAmount" format="float" />
 
         <attr name="keyTextStyle">
-            <flag name="normal" value="0" />
-            <flag name="bold" value="1" />
-            <flag name="italic" value="2" />
+            <enum name="normal" value="0" />
+            <enum name="bold" value="1" />
+            <enum name="italic" value="2" />
         </attr>
 
-        <attr name="symbolColorScheme">
-            <flag name="white" value="0" />
-            <flag name="black" value="1" />
+        <attr name="colorScheme">
+            <!-- This should be aligned with BaseKeyboardView.COLOR_SCHEME_* -->
+            <enum name="white" value="0" />
+            <enum name="black" value="1" />
         </attr>
 
     </declare-styleable>

java/res/values/styles.xml

diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index d2acafd..6ab4ded 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -31,7 +31,7 @@
         <item name="shadowColor">#BB000000</item>
         <item name="shadowRadius">2.75</item>
         <item name="backgroundDimAmount">0.5</item>
-        <item name="symbolColorScheme">white</item>
+        <item name="colorScheme">white</item>
     </style>
     <style name="KeyPreviewAnimation">
         <item name="android:windowEnterAnimation">@anim/key_preview_fadein</item>