Change color of a shodow behind the current language in Black symbols scheme

Change-Id: I8ce049e1d77753a481cd45b53254ba248dca9f15

2 files changed, 11 insertions, 8 deletions

diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 4581cc961..343a9405d 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -22,7 +22,8 @@
     <color name="candidate_recommended">#FFE35900</color>
     <color name="candidate_other">#ff808080</color>
     <color name="latinkeyboard_transparent">#00000000</color>
-    <color name="latinkeyboard_bar_language_shadow">#80000000</color>
+    <color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
+    <color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
     <color name="latinkeyboard_bar_language_text">#FF808080</color>
     <color name="latinkeyboard_extension_background">#A0000000</color>
     <color name="latinkeyboard_text_color">#FF000000</color>
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 2dd03389c..3d1e1d3cf 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -350,7 +350,7 @@ public class LatinKeyboard extends Keyboard {
             Bitmap buffer = Bitmap.createBitmap(mSpaceKey.width, mSpaceIcon.getIntrinsicHeight(),
                     Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(buffer);
-            drawSpaceBar(canvas, buffer.getWidth(), buffer.getHeight(), 255);
+            drawSpaceBar(canvas, buffer.getWidth(), buffer.getHeight(), 255, isBlack);
             mSpaceKey.icon = new BitmapDrawable(mRes, buffer);
             mSpaceKey.repeatable = mLanguageSwitcher.getLocaleCount() < 2;
         } else {
@@ -360,7 +360,7 @@ public class LatinKeyboard extends Keyboard {
         }
     }
 
-    private void drawSpaceBar(Canvas canvas, int width, int height, int opacity) {
+    private void drawSpaceBar(Canvas canvas, int width, int height, int opacity, boolean isBlack) {
         canvas.drawColor(mRes.getColor(R.color.latinkeyboard_transparent), PorterDuff.Mode.CLEAR);
         Paint paint = new Paint();
         paint.setAntiAlias(true);
@@ -370,12 +370,14 @@ public class LatinKeyboard extends Keyboard {
         paint.setTextAlign(Align.CENTER);
         final String language = getInputLanguage(mSpaceKey.width, paint);
         final int ascent = (int) -paint.ascent();
-        paint.setColor(mRes.getColor(R.color.latinkeyboard_bar_language_shadow));
-        canvas.drawText(language,
-                width / 2, ascent - 1, paint);
+
+        int shadowColor = isBlack ? mRes.getColor(R.color.latinkeyboard_bar_language_shadow_black)
+                : mRes.getColor(R.color.latinkeyboard_bar_language_shadow_white);
+
+        paint.setColor(shadowColor);
+        canvas.drawText(language, width / 2, ascent - 1, paint);
         paint.setColor(mRes.getColor(R.color.latinkeyboard_bar_language_text));
-        canvas.drawText(language,
-                width / 2, ascent, paint);
+        canvas.drawText(language, width / 2, ascent, paint);
         // Put arrows on either side of the text
         if (mLanguageSwitcher.getLocaleCount() > 1) {
             Rect bounds = new Rect();