SnapdragonCamera: Remove scene mode and deepportrait

Remove scene mode only keep HDR mode, and remove deepportrait.

CRs-Fixed: 2432037
Change-Id: I3f062dcc952f918dd51ee7fdfeefc8bf9c8d1c0f

1 files changed, 5 insertions, 9 deletions

diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java
index 6bddf0139..fb7f9d6fd 100755
--- a/src/com/android/camera/ui/OneUICameraControls.java
+++ b/src/com/android/camera/ui/OneUICameraControls.java
@@ -59,7 +59,6 @@ public class OneUICameraControls extends RotatableLayout {
     private View mPreview;
     private View mSceneModeSwitcher;
     private View mFilterModeSwitcher;
-    private View mDeepportraitSwitcher;
     private View mMakeupSeekBar;
     private View mMakeupSeekBarLowText;
     private View mMakeupSeekBarHighText;
@@ -154,7 +153,6 @@ public class OneUICameraControls extends RotatableLayout {
         mMakeupSeekBarLayout = findViewById(R.id.makeup_seekbar_layout);
         ((SeekBar)mMakeupSeekBar).setMax(100);
         mFlashButton = findViewById(R.id.flash_button);
-        mDeepportraitSwitcher = findViewById(R.id.deepportrait_switcher);
         mMute = findViewById(R.id.mute_button);
         mPreview = findViewById(R.id.preview_thumb);
         mSceneModeSwitcher = findViewById(R.id.scene_mode_switcher);
@@ -232,7 +230,7 @@ public class OneUICameraControls extends RotatableLayout {
 
         mViews = new View[]{
                 mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
-                mTsMakeupSwitcher,mDeepportraitSwitcher, mFlashButton, mShutter,
+                mFlashButton, mShutter,
                 mPreview, mVideoShutter, mPauseButton, mCancelButton
         };
         mBottomLargeSize = getResources().getDimensionPixelSize(
@@ -241,6 +239,7 @@ public class OneUICameraControls extends RotatableLayout {
                 R.dimen.one_ui_bottom_small);
         if(!BeautificationFilter.isSupportedStatic()) {
             mTsMakeupSwitcher.setEnabled(false);
+            mTsMakeupSwitcher.setVisibility(View.GONE);
         }
         setProModeParameters();
     }
@@ -339,17 +338,14 @@ public class OneUICameraControls extends RotatableLayout {
         setLocation(mFilterModeSwitcher, true, 1);
         if (mIsVideoMode) {
             setLocation(mMute, true, 2);
-            setLocation(mTsMakeupSwitcher, true, 3);
-            setLocation(mFlashButton, true, 4);
+            setLocation(mFlashButton, true, 3);
             setLocation(mPauseButton, false, 3.15f);
             setLocation(mShutter, false , 0.85f);
             setLocation(mVideoShutter, false, 2);
             setLocation(mExitBestPhotpMode ,false, 4);
         } else {
             setLocation(mFrontBackSwitcher, true, 2);
-            setLocation(mTsMakeupSwitcher, true, 3);
-            setLocation(mFlashButton, true, 4);
-            setLocation(mDeepportraitSwitcher,true,5);
+            setLocation(mFlashButton, true, 3);
             if (mIntentMode == CaptureModule.INTENT_MODE_CAPTURE) {
                 setLocation(mShutter, false, 2);
                 setLocation(mCancelButton, false, 0.85f);
@@ -500,7 +496,7 @@ public class OneUICameraControls extends RotatableLayout {
         mOrientation = orientation;
         View[] views = {
                 mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
-                mTsMakeupSwitcher, mFlashButton, mDeepportraitSwitcher, mPreview, mMute,
+                mFlashButton, mPreview, mMute,
                 mShutter, mVideoShutter, mMakeupSeekBarLowText, mMakeupSeekBarHighText,
                 mPauseButton, mExitBestPhotpMode
         };