diff options
author | junjiez <junjiez@codeaurora.org> | 2016-11-14 16:12:13 +0800 |
---|---|---|
committer | junjiez <junjiez@codeaurora.org> | 2016-11-15 09:47:23 +0800 |
commit | e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972 (patch) | |
tree | 9c67700b222722d0ca32e36a455cdab6d1b6e4f7 /src | |
parent | 0beacc39dd10f5f694dc530e18ab9d7ff1977b5b (diff) | |
download | android_packages_apps_Snap-e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972.tar.gz android_packages_apps_Snap-e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972.tar.bz2 android_packages_apps_Snap-e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972.zip |
SnapdragonCamera:Modify beautify interface
Modify beautify interface, make it the same as
the design. Disable FilterMode button and SceneMode
button when beautify is enabled.
Change-Id: I0ba976973ff06df4e17a93c76781127dda090416
CRs-Fixed: 1084369
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 ae67007d0..138ef84fc 100644..100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -279,6 +279,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, @Override public void onClick(View v) { toggleMakeup(); + updateMenus(); } }); setMakeupButtonIcon(); @@ -368,8 +369,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); @@ -478,6 +479,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mFilterLayout = null; } } + updateMenus(); } public void openSettingsMenu() { @@ -542,6 +544,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void onClick(View v) { addFilterMode(); adjustOrientation(); + updateMenus(); } }); } @@ -859,9 +862,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; } |