diff options
author | Camera Software Integration <camswint@localhost> | 2016-12-01 09:17:08 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-01 09:17:08 -0800 |
commit | 03469d0ac6d64bc256a1674cadb218bda1308dc5 (patch) | |
tree | b9277944de15af5eb3e31728f2b062b1444349db /src/com | |
parent | c3c64d3854db79181a07feead8f5ef0d53717752 (diff) | |
parent | 92ea0735ed488f356fd9ae077df2629cc6f53e97 (diff) | |
download | android_packages_apps_Snap-03469d0ac6d64bc256a1674cadb218bda1308dc5.tar.gz android_packages_apps_Snap-03469d0ac6d64bc256a1674cadb218bda1308dc5.tar.bz2 android_packages_apps_Snap-03469d0ac6d64bc256a1674cadb218bda1308dc5.zip |
Merge "SnapdragonCamera: Disable color effects when scene mode is non-automatic" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com')
-rwxr-xr-x | src/com/android/camera/CaptureUI.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 77100ecfb..b026af892 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -77,6 +77,7 @@ import org.codeaurora.snapcam.R; import java.util.List; import java.util.Locale; +import java.util.Map; public class CaptureUI implements FocusOverlayManager.FocusUI, PreviewGestures.SingleTapListener, @@ -554,6 +555,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, String value = mSettingsManager.getValue(SettingsManager.KEY_COLOR_EFFECT); if (value == null) return; + enableView(mFilterModeSwitcher, SettingsManager.KEY_COLOR_EFFECT); + mFilterModeSwitcher.setVisibility(View.VISIBLE); mFilterModeSwitcher.setOnClickListener(new View.OnClickListener() { @Override @@ -565,6 +568,13 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, }); } + private void enableView(View view, String key) { + Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap(); + SettingsManager.Values values = map.get(key); + boolean enabled = values.overriddenValue == null; + view.setEnabled(enabled); + } + public void showTimeLapseUI(boolean enable) { if (mTimeLapseLabel != null) { mTimeLapseLabel.setVisibility(enable ? View.VISIBLE : View.GONE); @@ -1327,6 +1337,12 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, @Override public void onSettingsChanged(List<SettingsManager.SettingState> settings) { + for( SettingsManager.SettingState state : settings) { + if( state.key.equals(SettingsManager.KEY_COLOR_EFFECT) ) { + enableView(mFilterModeSwitcher, SettingsManager.KEY_COLOR_EFFECT); + break; + } + } } public void startSelfieFlash() { |