commit d15320b1223598eed4e6c78d3386ef082a0db548
author Wei Huang <weih@google.com> Mon Nov 07 11:03:23 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 07 11:03:23 2011 -0800
tree e9a4af8debd75a371abc060663c8a9fb01d9db97
parent bd7f2bdf9100b56ead3ebb75239f31371aaf8047
parent c12e12365fc3b0b3b4718eced8f3dc6a776c0851

Merge "Make 40% opacity for disabled indicators." into ics-mr1

res/layout/indicator_bar.xml

diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index 33a8c7a..b7348b4 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -63,7 +63,7 @@
                     android:layout_width="0dp"
                     android:background="@color/mode_selection_border"
                     android:visibility="gone" />
-            <com.android.camera.ui.ColorFilterImageView
+            <com.android.camera.ui.TwoStateImageView
                     android:id="@+id/back_to_first_level"
                     android:layout_height="match_parent"
                     android:layout_width="wrap_content"

src/com/android/camera/ui/IndicatorControlWheel.java

diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index 3b8bea4..92f658a 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -187,7 +187,7 @@
         if (rotatable) {
             view = new RotateImageView(context);
         } else {
-            view = new ColorFilterImageView(context);
+            view = new TwoStateImageView(context);
         }
         view.setImageResource(resourceId);
         view.setOnClickListener(this);

src/com/android/camera/ui/RotateImageView.java

diff --git a/src/com/android/camera/ui/RotateImageView.java b/src/com/android/camera/ui/RotateImageView.java
index f47a26b..39c4df2 100644
--- a/src/com/android/camera/ui/RotateImageView.java
+++ b/src/com/android/camera/ui/RotateImageView.java
@@ -32,7 +32,7 @@
 /**
  * A @{code ImageView} which can rotate it's content.
  */
-public class RotateImageView extends ColorFilterImageView implements Rotatable {
+public class RotateImageView extends TwoStateImageView implements Rotatable {
 
     @SuppressWarnings("unused")
     private static final String TAG = "RotateImageView";

src/com/android/camera/ui/TwoStateImageView.java

diff --git a/src/com/android/camera/ui/ColorFilterImageView.java b/src/com/android/camera/ui/TwoStateImageView.java
similarity index 73%
rename from src/com/android/camera/ui/ColorFilterImageView.java
rename to src/com/android/camera/ui/TwoStateImageView.java
index 56bef82..beb6bf5 100644
--- a/src/com/android/camera/ui/ColorFilterImageView.java
+++ b/src/com/android/camera/ui/TwoStateImageView.java
@@ -23,18 +23,17 @@
 import android.widget.ImageView;
 
 /**
- * A @{code ImageView} which grey out the icon if disabled.
+ * A @{code ImageView} which change the opacity of the icon if disabled.
  */
-public class ColorFilterImageView extends ImageView {
-    private final int DISABLED_COLOR;
+public class TwoStateImageView extends ImageView {
+    private final float DISABLED_ALPHA = 0.4f;
     private boolean mFilterEnabled = true;
 
-    public ColorFilterImageView(Context context, AttributeSet attrs) {
+    public TwoStateImageView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        DISABLED_COLOR = context.getResources().getColor(R.color.icon_disabled_color);
     }
 
-    public ColorFilterImageView(Context context) {
+    public TwoStateImageView(Context context) {
         this(context, null);
     }
 
@@ -43,9 +42,9 @@
         super.setEnabled(enabled);
         if (mFilterEnabled) {
             if (enabled) {
-                clearColorFilter();
+                setAlpha(1.0f);
             } else {
-                setColorFilter(DISABLED_COLOR);
+                setAlpha(DISABLED_ALPHA);
             }
         }
     }