Change background and panel colors

bug:7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4

diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index bbf24d8..15bf2bc 100644 (file)
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -19,8 +19,8 @@
     <color name="red">#FF0000</color>
     <color name="blue">#0000FF</color>
     <color name="text_toolbar">#FFFFFF</color>
-    <color name="background_screen">#000000</color>
+    <color name="background_screen">#101010</color>
     <color name="background_toolbar">#363949</color>
-    <color name="background_main_toolbar">#1e2028</color>
+    <color name="background_main_toolbar">#232323</color>
     <color name="toolbar_separation_line">#333333</color>
 </resources>
\ No newline at end of file

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index c3bc087..70e5300 100644 (file)
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -150,6 +150,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         ImageFilterRS.setRenderScriptContext(this);
 
         ImageShow.setDefaultBackgroundColor(getResources().getColor(R.color.background_screen));
+        ImageSmallFilter.setDefaultBackgroundColor(getResources().getColor(R.color.background_main_toolbar));
         // TODO: get those values from XML.
         ImageShow.setTextSize((int) getPixelsFromDip(12));
         ImageShow.setTextPadding((int) getPixelsFromDip(10));

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
index 53e51ae..71a69c3 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
@@ -42,7 +42,7 @@ public class ImageSmallFilter extends ImageShow implements View.OnClickListener
     // TODO: move this to xml.
     protected static int mMargin = 12;
     protected static int mTextMargin = 8;
-    protected final int mBackgroundColor = Color.argb(255, 30, 32, 40);
+    protected static int mBackgroundColor = Color.BLUE;
     protected final int mSelectedBackgroundColor = Color.WHITE;
     protected final int mTextColor = Color.WHITE;
 
@@ -54,6 +54,10 @@ public class ImageSmallFilter extends ImageShow implements View.OnClickListener
         mTextMargin = value;
     }
 
+    public static void setDefaultBackgroundColor(int value) {
+        mBackgroundColor = value;
+    }
+
     public ImageSmallFilter(Context context, AttributeSet attrs) {
         super(context, attrs);
         setOnClickListener(this);