From 10f9ed035975937f670679a9d238d9db9e9952f1 Mon Sep 17 00:00:00 2001
From: junjiez <junjiez@codeaurora.org>
Date: Thu, 24 Nov 2016 16:31:52 +0800
Subject: SnapdragonCamera:Modify Camera2 VideoRecording UI

Modify Camera2 VideoRecording UI and make it look like
the same as the design document shows.

Change-Id: I41ea3db7312847fe56ad9d8e73dfa92b030e79e2
CRs-Fixed: 1093507
---
 src/com/android/camera/CaptureUI.java | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 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 b026af892..ed6e55963 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -194,7 +194,15 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
     private void previewUIReady() {
         if((mSurfaceHolder != null && mSurfaceHolder.getSurface().isValid())) {
             mModule.onPreviewUIReady();
-            mActivity.updateThumbnail(mThumbnail);
+            if (mIsVideoUI && mThumbnail != null) {
+                mThumbnail.setVisibility(View.INVISIBLE);
+                mThumbnail = null;
+                mActivity.updateThumbnail(mThumbnail);
+            } else if (!mIsVideoUI){
+                if (mThumbnail == null)
+                    mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
+                mActivity.updateThumbnail(mThumbnail);
+            }
         }
     }
 
@@ -369,7 +377,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         mRenderOverlay.requestLayout();
 
         mActivity.setPreviewGestures(mGestures);
-        ((ViewGroup)mRootView).removeView(mRecordingTimeRect);
+        mRecordingTimeRect.setVisibility(View.GONE);
         showFirstTimeHelp();
     }
 
@@ -590,13 +598,13 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
             }
             mVideoButton.setImageResource(R.drawable.video_stop);
             mRecordingTimeView.setText("");
-            ((ViewGroup)mRootView).addView(mRecordingTimeRect);
+            mRecordingTimeRect.setVisibility(View.VISIBLE);
             mMuteButton.setVisibility(View.VISIBLE);
         } else {
             mFlashButton.setVisibility(View.VISIBLE);
             mFlashButton.init(false);
             mVideoButton.setImageResource(R.drawable.video_capture);
-            ((ViewGroup)mRootView).removeView(mRecordingTimeRect);
+            mRecordingTimeRect.setVisibility(View.GONE);
             mMuteButton.setVisibility(View.INVISIBLE);
         }
     }
@@ -609,25 +617,26 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
     }
 
     public void hideUIwhileRecording() {
-        mCameraControls.setWillNotDraw(true);
+        mCameraControls.setVideoMode(true);
         mFrontBackSwitcher.setVisibility(View.INVISIBLE);
         mFilterModeSwitcher.setVisibility(View.INVISIBLE);
         mSceneModeSwitcher.setVisibility(View.INVISIBLE);
-
         String value = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP);
         if(value != null && value.equals("0")) {
             mMakeupButton.setVisibility(View.INVISIBLE);
         }
         mIsVideoUI = true;
+        mPauseButton.setVisibility(View.VISIBLE);
     }
 
     public void showUIafterRecording() {
-        mCameraControls.setWillNotDraw(false);
+        mCameraControls.setVideoMode(false);
         mFrontBackSwitcher.setVisibility(View.VISIBLE);
         mFilterModeSwitcher.setVisibility(View.VISIBLE);
         mSceneModeSwitcher.setVisibility(View.VISIBLE);
         mMakeupButton.setVisibility(View.VISIBLE);
         mIsVideoUI = false;
+        mPauseButton.setVisibility(View.INVISIBLE);
     }
 
     public void addFilterMode() {
@@ -1198,13 +1207,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
             }
         }
         if (mRecordingTimeRect != null) {
-            if (orientation == 180) {
-                mRecordingTimeRect.setOrientation(0, false);
-                mRecordingTimeView.setRotation(180);
-            } else {
-                mRecordingTimeView.setRotation(0);
-                mRecordingTimeRect.setOrientation(orientation, false);
-            }
+            mRecordingTimeView.setRotation(-orientation);
         }
         if (mFaceView != null) {
             mFaceView.setDisplayRotation(orientation);
-- 
cgit v1.2.3