diff options
author | weijiew <weijiew@codeaurora.org> | 2016-12-06 15:54:24 +0800 |
---|---|---|
committer | weijiew <weijiew@codeaurora.org> | 2016-12-13 19:30:22 +0800 |
commit | 22958402991a9ab0cfe6049db8d9eda5eac1ec26 (patch) | |
tree | e77e13780dc3428cd78ce8a69b88c6305ef7aaf5 /src/com/android/camera/CaptureUI.java | |
parent | 568dfe8fb8d7150e242ec778b039458d4e6e0b29 (diff) | |
download | android_packages_apps_Snap-22958402991a9ab0cfe6049db8d9eda5eac1ec26.tar.gz android_packages_apps_Snap-22958402991a9ab0cfe6049db8d9eda5eac1ec26.tar.bz2 android_packages_apps_Snap-22958402991a9ab0cfe6049db8d9eda5eac1ec26.zip |
SnapdragonCamera:Modify beautify interface
Disable FilterMode button and SceneMode button when Beautify is enabled;
Disable FilterMode button and Beautify button when SceneMode is none
automatic;Disable SceneMode button and Beautify button when FilterMode
is enabled.
Change-Id: I20ce8c836740c97e35f9ba20789fab31398f7270
CRs-Fixed: 1099382
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index aed62aaa9..459695e8e 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -315,6 +315,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, initSceneModeButton(); initSwitchCamera(); initFlashButton(); + updateMenus(); mRecordingTimeView = (TextView) mRootView.findViewById(R.id.recording_time); mRecordingTimeRect = (RotateLayout) mRootView.findViewById(R.id.recording_time_rect); @@ -448,6 +449,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, initFlashButton(); setMakeupButtonIcon(); showSceneModeLabel(); + updateMenus(); if(mModule.isTrackingFocusSettingOn()) { mTrackingFocusRenderer.setVisible(false); mTrackingFocusRenderer.setVisible(true); @@ -1042,13 +1044,18 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, boolean enableSceneMenu = true; String makeupValue = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP); int colorEffect = mSettingsManager.getValueIndex(SettingsManager.KEY_COLOR_EFFECT); + String sceneMode = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); if (makeupValue != null && !makeupValue.equals("0")) { enableSceneMenu = false; enableFilterMenu = false; } else if (colorEffect != 0 || mFilterMenuStatus == FILTER_MENU_ON){ enableSceneMenu = false; enableMakeupMenu = false; + }else if ( sceneMode != null && !sceneMode.equals("0")){ + enableMakeupMenu = false; + enableFilterMenu = false; } + mMakeupButton.setEnabled(enableMakeupMenu); mFilterModeSwitcher.setEnabled(enableFilterMenu); mSceneModeSwitcher.setEnabled(enableSceneMenu); |