diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2019-04-18 07:03:49 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-04-18 07:03:49 -0700 |
commit | 510543b059523e4778110e22376d8736e95383b8 (patch) | |
tree | fa55e10547eb3bee13573a87644379cbeeae62b4 | |
parent | 752c42c68acbb1aae78ff30d6c3ac4d8a2a369a0 (diff) | |
parent | 8acb462b46c930bf6f6c6192012a11f2e127ecc4 (diff) | |
download | android_packages_apps_Snap-510543b059523e4778110e22376d8736e95383b8.tar.gz android_packages_apps_Snap-510543b059523e4778110e22376d8736e95383b8.tar.bz2 android_packages_apps_Snap-510543b059523e4778110e22376d8736e95383b8.zip |
Merge "SnapdragonCamera: Remove scene mode and deepportrait" into camera-SnapdragonCamera.lnx.2.0
-rwxr-xr-x | res/layout/one_ui_layout.xml | 4 | ||||
-rwxr-xr-x | src/com/android/camera/CaptureUI.java | 50 | ||||
-rwxr-xr-x | src/com/android/camera/SettingsManager.java | 6 | ||||
-rwxr-xr-x | src/com/android/camera/ui/OneUICameraControls.java | 14 |
4 files changed, 17 insertions, 57 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index a10d56549..7bc0907e3 100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -134,10 +134,6 @@ android:id="@+id/ts_makeup_switcher" style="@style/OneUIMenuButton" /> - <com.android.camera.ui.RotateImageView - android:id="@+id/deepportrait_switcher" - style="@style/OneUIMenuButton" /> - <LinearLayout android:id="@+id/remaining_photos" android:layout_width="wrap_content" 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<Integer> 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); } diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 0856beb29..b05bd8ccd 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -98,6 +98,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final int SCENE_MODE_AUTO_INT = 0; public static final int SCENE_MODE_NIGHT_INT = 5; + public static final int SCENE_MODE_HDR_INT = 18; public static final int TALOS_SOCID = 355; public static final int MOOREA_SOCID = 365; @@ -1828,7 +1829,10 @@ public class SettingsManager implements ListMenu.SettingsListener { if (DeepPortraitFilter.isSupportedStatic()) modes.add(SCENE_MODE_DEEPPORTRAIT_INT+""); modes.add("" + SCENE_MODE_PROMODE_INT); for (int mode : sceneModes) { - modes.add("" + mode); + //remove scene mode like "Sunset", "Night" such as, only keep "HDR" mode 1889 + if (mode == SCENE_MODE_HDR_INT) { + modes.add("" + mode); + } } return modes; } 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 }; |