diff options
author | Camera Software Integration <camswint@localhost> | 2016-12-01 09:16:39 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-01 09:16:39 -0800 |
commit | 42413bd3b8c7e363f6a4e5443f3f93913f2349ec (patch) | |
tree | 1fb4f2d0f367cb6b3e2f144cbf4c2b8bc86f0a6e /src | |
parent | d17195f046cceff271bc6075b0663e32708c6803 (diff) | |
parent | e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972 (diff) | |
download | android_packages_apps_Snap-42413bd3b8c7e363f6a4e5443f3f93913f2349ec.tar.gz android_packages_apps_Snap-42413bd3b8c7e363f6a4e5443f3f93913f2349ec.tar.bz2 android_packages_apps_Snap-42413bd3b8c7e363f6a4e5443f3f93913f2349ec.zip |
Merge "SnapdragonCamera:Modify beautify interface" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CaptureUI.java | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index ed11807da..77100ecfb 100644..100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -280,6 +280,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, @Override public void onClick(View v) { toggleMakeup(); + updateMenus(); } }); setMakeupButtonIcon(); @@ -375,8 +376,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, String value = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP); if(value != null && !mIsVideoUI) { if(value.equals("0")) { - mSettingsManager.setValue(SettingsManager.KEY_MAKEUP, "10"); - mMakeupSeekBar.setProgress(10); + mSettingsManager.setValue(SettingsManager.KEY_MAKEUP, "50"); + mMakeupSeekBar.setProgress(50); mMakeupSeekBarLayout.setVisibility(View.VISIBLE); mSeekbarBody.setVisibility(View.VISIBLE); mSeekbarToggleButton.setImageResource(R.drawable.seekbar_hide); @@ -491,6 +492,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mFilterLayout = null; } } + updateMenus(); } public void openSettingsMenu() { @@ -558,6 +560,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void onClick(View v) { addFilterMode(); adjustOrientation(); + updateMenus(); } }); } @@ -874,9 +877,28 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void cleanUpMenus() { showUI(); + updateMenus(); mActivity.setSystemBarsVisibility(false); } + public void updateMenus() { + boolean enableMakeupMenu = true; + boolean enableFilterMenu = true; + boolean enableSceneMenu = true; + String makeupValue = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP); + int colorEffect = mSettingsManager.getValueIndex(SettingsManager.KEY_COLOR_EFFECT); + if (makeupValue != null && !makeupValue.equals("0")) { + enableSceneMenu = false; + enableFilterMenu = false; + } else if (colorEffect != 0 || mFilterMenuStatus == FILTER_MENU_ON){ + enableSceneMenu = false; + enableMakeupMenu = false; + } + mMakeupButton.setEnabled(enableMakeupMenu); + mFilterModeSwitcher.setEnabled(enableFilterMenu); + mSceneModeSwitcher.setEnabled(enableSceneMenu); + } + public boolean arePreviewControlsVisible() { return !mUIhidden; } |