From 8acb462b46c930bf6f6c6192012a11f2e127ecc4 Mon Sep 17 00:00:00 2001 From: xianming wang Date: Wed, 10 Apr 2019 15:19:42 +0800 Subject: SnapdragonCamera: Remove scene mode and deepportrait Remove scene mode only keep HDR mode, and remove deepportrait. CRs-Fixed: 2432037 Change-Id: I3f062dcc952f918dd51ee7fdfeefc8bf9c8d1c0f --- src/com/android/camera/CaptureUI.java | 50 +++++------------------------------ 1 file changed, 7 insertions(+), 43 deletions(-) (limited to 'src/com/android/camera/CaptureUI.java') diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index b4fe014bf..ce520dd7e 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -199,7 +199,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, private View mSceneModeSwitcher; private View mFrontBackSwitcher; private ImageView mMakeupButton; - private ImageView mDeepportraitSwitcher; private SeekBar mMakeupSeekBar; private SeekBar mDeepportraitSeekBar; private View mMakeupSeekBarLayout; @@ -319,7 +318,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mFrontBackSwitcher = mRootView.findViewById(R.id.front_back_switcher); mMakeupButton = (ImageView) mRootView.findViewById(R.id.ts_makeup_switcher); mMakeupSeekBarLayout = mRootView.findViewById(R.id.makeup_seekbar_layout); - mDeepportraitSwitcher = (ImageView) mRootView.findViewById(R.id.deepportrait_switcher); mSeekbarBody = mRootView.findViewById(R.id.seekbar_body); mSeekbarToggleButton = (ImageView) mRootView.findViewById(R.id.seekbar_toggle); mSeekbarToggleButton.setOnClickListener(new View.OnClickListener() { @@ -384,25 +382,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, }); setMakeupButtonIcon(); - mDeepportraitSwitcher.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (module != null && !module.isAllSessionClosed()) { - String value = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); - if(value == null || - Integer.valueOf(value) != SettingsManager.SCENE_MODE_DEEPPORTRAIT_INT) { - mSettingsManager.setValue(SettingsManager.KEY_SCENE_MODE,""+ - SettingsManager.SCENE_MODE_DEEPPORTRAIT_INT); - } else { - mSettingsManager.setValue(SettingsManager.KEY_SCENE_MODE, - ""+SettingsManager.SCENE_MODE_AUTO_INT); - } - } - setDeepportraitButtonIcon(); - } - }); - setDeepportraitButtonIcon(); - mFlashButton = (FlashToggleButton) mRootView.findViewById(R.id.flash_button); mProModeCloseButton = mRootView.findViewById(R.id.promode_close_button); mProModeCloseButton.setOnClickListener(new View.OnClickListener() { @@ -666,7 +645,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void run() { if(value != null && !value.equals("0")) { mMakeupButton.setImageResource(R.drawable.beautify_on); - mMakeupSeekBarLayout.setVisibility(View.VISIBLE); + mMakeupSeekBarLayout.setVisibility(View.GONE); } else { mMakeupButton.setImageResource(R.drawable.beautify); mMakeupSeekBarLayout.setVisibility(View.GONE); @@ -679,20 +658,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, return mDeepZoomValue; } - private void setDeepportraitButtonIcon() { - boolean enable = DeepPortraitFilter.isSupportedStatic(); - mDeepportraitSwitcher.setEnabled(enable); - mActivity.runOnUiThread(new Runnable() { - public void run() { - if(mModule.isDeepPortraitMode()) { - mDeepportraitSwitcher.setImageResource(R.drawable.deep_portrait_on); - } else { - mDeepportraitSwitcher.setImageResource(R.drawable.deep_portrait); - } - } - }); - } - public void onCameraOpened(List cameraIds) { mGestures.setCaptureUI(this); if (mModule.isDeepZoom()) { @@ -708,7 +673,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, initFilterModeButton(); initFlashButton(); setMakeupButtonIcon(); - setDeepportraitButtonIcon(); showSceneModeLabel(); updateMenus(); if(mModule.isTrackingFocusSettingOn()) { @@ -1063,9 +1027,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mSceneModeSwitcher.setVisibility(View.INVISIBLE); String value = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP); if(value != null && value.equals("0")) { - mMakeupButton.setVisibility(View.INVISIBLE); + mMakeupButton.setVisibility(View.GONE); } - mDeepportraitSwitcher.setVisibility(View.INVISIBLE); mIsVideoUI = true; mPauseButton.setVisibility(View.VISIBLE); } @@ -1075,8 +1038,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mFrontBackSwitcher.setVisibility(View.VISIBLE); mFilterModeSwitcher.setVisibility(View.VISIBLE); mSceneModeSwitcher.setVisibility(View.VISIBLE); - mMakeupButton.setVisibility(View.VISIBLE); - mDeepportraitSwitcher.setVisibility(View.VISIBLE); + mMakeupButton.setVisibility(View.GONE); mIsVideoUI = false; mPauseButton.setVisibility(View.INVISIBLE); //exit recording mode needs to refresh scene mode label. @@ -1306,8 +1268,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, if (mSceneModeSwitcher != null) mSceneModeSwitcher.setVisibility(status); if (mFilterModeSwitcher != null) mFilterModeSwitcher.setVisibility(status); if (mFilterModeSwitcher != null) mFilterModeSwitcher.setVisibility(status); - if (mMakeupButton != null) mMakeupButton.setVisibility(status); - if (mDeepportraitSwitcher != null) mDeepportraitSwitcher.setVisibility(status); + if (mMakeupButton != null) mMakeupButton.setVisibility(View.GONE); } public void initializeControlByIntent() { @@ -1406,6 +1367,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, enableMakeupMenu = false; } mMakeupButton.setEnabled(enableMakeupMenu); + if(!BeautificationFilter.isSupportedStatic()) { + mMakeupButton.setVisibility(View.GONE); + } mFilterModeSwitcher.setEnabled(enableFilterMenu); mSceneModeSwitcher.setEnabled(enableSceneMenu); } -- cgit v1.2.3