diff options
15 files changed, 10 insertions, 4 deletions
diff --git a/res/drawable-xlarge-mdpi/ic_time_lapse_holo_dark.png b/res/drawable-xlarge-mdpi/ic_time_lapse_holo_dark.png Binary files differnew file mode 100644 index 0000000..2bb9c57 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_time_lapse_holo_dark.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_coloreffect.png b/res/drawable-xlarge-mdpi/ic_viewfinder_coloreffect.png Binary files differnew file mode 100644 index 0000000..738ef05 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_coloreffect.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_auto.png b/res/drawable-xlarge-mdpi/ic_viewfinder_flash_auto.png Binary files differnew file mode 100644 index 0000000..7b1cb6c --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_flash_auto.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_off.png b/res/drawable-xlarge-mdpi/ic_viewfinder_flash_off.png Binary files differnew file mode 100644 index 0000000..ecf8220 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_flash_off.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_on.png b/res/drawable-xlarge-mdpi/ic_viewfinder_flash_on.png Binary files differnew file mode 100644 index 0000000..c01a882 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_flash_on.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_scene_mode.png b/res/drawable-xlarge-mdpi/ic_viewfinder_scene_mode.png Binary files differnew file mode 100644 index 0000000..d11b057 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_scene_mode.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_settings.png b/res/drawable-xlarge-mdpi/ic_viewfinder_settings.png Binary files differnew file mode 100644 index 0000000..3093ed7 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_settings.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_high.png b/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_high.png Binary files differnew file mode 100644 index 0000000..432cb4a --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_high.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_low.png b/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_low.png Binary files differnew file mode 100644 index 0000000..45ada04 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_low.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_youtube.png b/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_youtube.png Binary files differnew file mode 100644 index 0000000..296ee75 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_youtube.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_auto.png b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_auto.png Binary files differnew file mode 100644 index 0000000..cf8ddb4 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_auto.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_daylight.png b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_daylight.png Binary files differnew file mode 100644 index 0000000..6472b09 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_daylight.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_fluorescent.png b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_fluorescent.png Binary files differnew file mode 100644 index 0000000..509f436 --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_fluorescent.png diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_incandescent.png b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_incandescent.png Binary files differnew file mode 100644 index 0000000..1ef4d2e --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_viewfinder_wb_incandescent.png diff --git a/src/com/android/camera/ui/IndicatorWheel.java b/src/com/android/camera/ui/IndicatorWheel.java index 7221a9f..42090a5 100644 --- a/src/com/android/camera/ui/IndicatorWheel.java +++ b/src/com/android/camera/ui/IndicatorWheel.java @@ -277,6 +277,7 @@ public class IndicatorWheel extends ViewGroup { if (key.equals(indicator.getKey())) { indicator.overrideSettings(value); setEnabled(indicator, (value == null)); + break; } } } @@ -303,10 +304,15 @@ public class IndicatorWheel extends ViewGroup { } private void setEnabled(ImageView view, boolean enabled) { - if (enabled) { - view.clearColorFilter(); - } else { - view.setColorFilter(DISABLED_COLOR); + // Don't do anything if state is not changed so not to interfere with + // the "highlight" state. + if (view.isEnabled() ^ enabled) { + view.setEnabled(enabled); + if (enabled) { + view.clearColorFilter(); + } else { + view.setColorFilter(DISABLED_COLOR); + } } } } |
