summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-24 15:43:56 -0700
committernicolasroard <nicolasroard@google.com>2012-10-24 15:51:04 -0700
commit0a23b42e4a3e3a93ce7389bfb7352944f644add6 (patch)
tree132a3345c85b5fe931c5ff257761fcf52e3503d3 /src
parent86282c8860edfec0df5c28d22d52aa4b59112d55 (diff)
downloadandroid_packages_apps_Gallery2-0a23b42e4a3e3a93ce7389bfb7352944f644add6.tar.gz
android_packages_apps_Gallery2-0a23b42e4a3e3a93ce7389bfb7352944f644add6.tar.bz2
android_packages_apps_Gallery2-0a23b42e4a3e3a93ce7389bfb7352944f644add6.zip
Change background and panel colors
bug:7385980 Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java1
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index c3bc0873a..70e5300fc 100644
--- 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 53e51ae13..71a69c3f8 100644
--- 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);