diff options
| author | Camera Software Integration <camswint@localhost> | 2016-12-20 02:56:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 02:56:47 -0800 |
| commit | 01d36a216eec93cba1525ccab7c5f987d297f7b5 (patch) | |
| tree | 6876c0e5b9dece08be7a2b83bcaeacd1f5b57bd6 /src/com/android/camera/CaptureUI.java | |
| parent | 656eb79e726d9121cd40e24225094ff99aa55e77 (diff) | |
| parent | 22958402991a9ab0cfe6049db8d9eda5eac1ec26 (diff) | |
| download | android_packages_apps_Snap-01d36a216eec93cba1525ccab7c5f987d297f7b5.tar.gz android_packages_apps_Snap-01d36a216eec93cba1525ccab7c5f987d297f7b5.tar.bz2 android_packages_apps_Snap-01d36a216eec93cba1525ccab7c5f987d297f7b5.zip | |
Merge "SnapdragonCamera:Modify beautify interface" into camera.lnx.1.0-dev.1.0
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 b77d635ff..8d54d1691 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -317,6 +317,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); @@ -450,6 +451,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, initFlashButton(); setMakeupButtonIcon(); showSceneModeLabel(); + updateMenus(); if(mModule.isTrackingFocusSettingOn()) { mTrackingFocusRenderer.setVisible(false); mTrackingFocusRenderer.setVisible(true); @@ -1044,13 +1046,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); |