diff options
author | Yuli Huang <yuli@google.com> | 2012-02-08 23:57:11 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 23:57:11 -0800 |
commit | ab6b92971e8c498abc53cfdaddc0b32f1447b9fc (patch) | |
tree | b283a6a18f60d1c270a586496be8b795c0f9eb92 /src | |
parent | b4058ad452ce0d2a1ac5c9f0b3da4d1428e41178 (diff) | |
parent | e4fe8b2be9cb28624e78606343d957edb3ed6cfc (diff) | |
download | android_packages_apps_Snap-ab6b92971e8c498abc53cfdaddc0b32f1447b9fc.tar.gz android_packages_apps_Snap-ab6b92971e8c498abc53cfdaddc0b32f1447b9fc.tar.bz2 android_packages_apps_Snap-ab6b92971e8c498abc53cfdaddc0b32f1447b9fc.zip |
Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/photoeditor/ImageActionButton.java | 41 | ||||
-rw-r--r-- | src/com/android/gallery3d/photoeditor/RestorableView.java | 7 |
2 files changed, 42 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/photoeditor/ImageActionButton.java b/src/com/android/gallery3d/photoeditor/ImageActionButton.java new file mode 100644 index 000000000..a919ac6d4 --- /dev/null +++ b/src/com/android/gallery3d/photoeditor/ImageActionButton.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.gallery3d.photoeditor; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.ImageButton; + +/** + * Image buttons used in Action-bar and Effects-menu that can be grayed out when set disabled. + * (Text buttons are automatically grayed out when disabled; however, image buttons are not.) + */ +public class ImageActionButton extends ImageButton { + + private static final float ENABLED_ALPHA = 1; + private static final float DISABLED_ALPHA = 0.28f; + + public ImageActionButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + setAlpha(enabled ? ENABLED_ALPHA : DISABLED_ALPHA); + } +} diff --git a/src/com/android/gallery3d/photoeditor/RestorableView.java b/src/com/android/gallery3d/photoeditor/RestorableView.java index fc987414b..705b412f0 100644 --- a/src/com/android/gallery3d/photoeditor/RestorableView.java +++ b/src/com/android/gallery3d/photoeditor/RestorableView.java @@ -32,9 +32,6 @@ import java.util.Map.Entry; */ public abstract class RestorableView extends FrameLayout { - private static final float ENABLED_ALPHA = 1; - private static final float DISABLED_ALPHA = 0.47f; - private final HashMap<Integer, Runnable> clickRunnables = new HashMap<Integer, Runnable>(); private final HashSet<Integer> changedViews = new HashSet<Integer>(); private final LayoutInflater inflater; @@ -92,9 +89,7 @@ public abstract class RestorableView extends FrameLayout { } public void setViewEnabled(int id, boolean enabled) { - View view = findViewById(id); - view.setEnabled(enabled); - view.setAlpha(enabled ? ENABLED_ALPHA : DISABLED_ALPHA); + findViewById(id).setEnabled(enabled); // Track views whose enabled status has been updated. changedViews.add(id); } |