diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 18 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 14 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 24 |
4 files changed, 50 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index e8dd948c3..276a78db2 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -1005,6 +1005,7 @@ public class PhotoUI implements PieListener, } protected void showCapturedImageForReview(byte[] jpegData, int orientation, boolean mirror) { + mCameraControls.hideCameraSettings(); mDecodeTaskForReview = new DecodeImageForReview(jpegData, orientation, mirror); mDecodeTaskForReview.execute(); mOnScreenIndicators.setVisibility(View.GONE); @@ -1017,6 +1018,7 @@ public class PhotoUI implements PieListener, } protected void hidePostCaptureAlert() { + mCameraControls.showCameraSettings(); if (mDecodeTaskForReview != null) { mDecodeTaskForReview.cancel(true); } diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 4aa686c51..ffbbc0ed4 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2028,8 +2028,6 @@ public class VideoModule implements CameraModule, mActivity.getString(R.string.pref_camera_dis_value_disable)); mUI.overrideSettings(CameraSettings.KEY_DIS, mActivity.getString(R.string.pref_camera_dis_value_disable)); - RotateTextToast.makeText(mActivity, R.string.video_quality_4k_disable_IS, - Toast.LENGTH_LONG).show(); } else { Log.e(TAG, "Not supported IS mode = " + mActivity.getString(R.string.pref_camera_dis_value_disable)); @@ -2446,6 +2444,22 @@ public class VideoModule implements CameraModule, @Override public void onSharedPreferenceChanged(ListPreference pref) { + if (pref != null && CameraSettings.KEY_VIDEO_QUALITY.equals(pref.getKey())) { + String videoQuality = pref.getValue(); + if (CameraSettings.VIDEO_QUALITY_TABLE.containsKey(videoQuality)) { + int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality); + if ((quality == CamcorderProfile.QUALITY_2160P + || quality == CamcorderProfile.QUALITY_4kDCI) + && mPreferences != null) { + String disDisable = mActivity.getString(R.string.pref_camera_dis_value_disable); + if (!disDisable.equals( + mPreferences.getString(CameraSettings.KEY_DIS, disDisable))) { + RotateTextToast.makeText(mActivity, R.string.video_quality_4k_disable_IS, + Toast.LENGTH_LONG).show(); + } + } + } + } onSharedPreferenceChanged(); } diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index cd8f6fe65..26a8cb972 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -495,9 +495,6 @@ public class WideAnglePanoramaModule mMosaicPreviewRenderer = renderer; mCameraTexture = mMosaicPreviewRenderer.getInputSurfaceTexture(); - if (!mPaused && !mThreadRunning && mWaitProcessorTask == null) { - mMainHandler.sendEmptyMessage(MSG_RESET_TO_PREVIEW); - } mRendererLock.notifyAll(); } mMosaicPreviewConfigured = true; @@ -515,9 +512,14 @@ public class WideAnglePanoramaModule if (mCaptureState == CAPTURE_STATE_MOSAIC){ capturePending = true; } - mPreviewUIWidth = r - l; - mPreviewUIHeight = b - t; - configMosaicPreview(); + int width = r -l; + int height = b - t; + if (mPreviewUIWidth != width || mPreviewUIHeight != height + || mCameraState != PREVIEW_ACTIVE) { + mPreviewUIWidth = r - l; + mPreviewUIHeight = b - t; + configMosaicPreview(); + } if (capturePending == true){ mMainHandler.post(new Runnable() { @Override diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 52750f32a..fe6de5351 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -928,6 +928,30 @@ public class CameraControls extends RotatableLayout { layoutRemaingPhotos(); } + public void hideCameraSettings() { + mFrontBackSwitcher.setVisibility(View.INVISIBLE); + if(TsMakeupManager.HAS_TS_MAKEUP) { + mTsMakeupSwitcher.setVisibility(View.INVISIBLE); + } else { + mHdrSwitcher.setVisibility(View.INVISIBLE); + } + mSceneModeSwitcher.setVisibility(View.INVISIBLE); + mFilterModeSwitcher.setVisibility(View.INVISIBLE); + mMenu.setVisibility(View.INVISIBLE); + } + + public void showCameraSettings() { + mFrontBackSwitcher.setVisibility(View.VISIBLE); + if(TsMakeupManager.HAS_TS_MAKEUP) { + mTsMakeupSwitcher.setVisibility(View.VISIBLE); + } else { + mHdrSwitcher.setVisibility(View.VISIBLE); + } + mSceneModeSwitcher.setVisibility(View.VISIBLE); + mFilterModeSwitcher.setVisibility(View.VISIBLE); + mMenu.setVisibility(View.VISIBLE); + } + private class ArrowTextView extends TextView { private static final int TEXT_SIZE = 14; private static final int PADDING_SIZE = 18; |