SnapdragonCamera: Add back missing setting menus

Adding back missing setting menus

Change-Id: I803d3f694b1953aa6a8932cbba6bb55c0d0e6352

1 files changed, 28 insertions, 23 deletions

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 6d0e12548..3e23fca83 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -103,12 +103,13 @@ public class VideoUI implements PieRenderer.PieListener,
     private LinearLayout mMenuLayout;
     private LinearLayout mSubMenuLayout;
     private LinearLayout mPreviewMenuLayout;
-    private CustomVideoMenu mCustomVideoMenu;
 
     private View mPreviewCover;
     private SurfaceView mSurfaceView = null;
     private int mPreviewWidth = 0;
     private int mPreviewHeight = 0;
+    private int mOriginalPreviewWidth = 0;
+    private int mOriginalPreviewHeight = 0;
     private float mAspectRatio = 4f / 3f;
     private boolean mAspectRatioResize;
     private Matrix mMatrix = null;
@@ -163,17 +164,23 @@ public class VideoUI implements PieRenderer.PieListener,
                 width = height;
                 height = oldWidth;
                 Log.d(TAG, "Swapping SurfaceView width & height dimensions");
+                if (mOriginalPreviewWidth != 0 && mOriginalPreviewHeight != 0) {
+                    int temp = mOriginalPreviewWidth;
+                    mOriginalPreviewWidth = mOriginalPreviewHeight;
+                    mOriginalPreviewHeight = temp;
+                }
             }
-
             if (mPreviewWidth != width || mPreviewHeight != height
                     || (mOrientationResize != mPrevOrientationResize)
                     || mAspectRatioResize) {
+                if (mOriginalPreviewWidth == 0) mOriginalPreviewWidth = width;
+                if (mOriginalPreviewHeight == 0) mOriginalPreviewHeight = height;
                 mPreviewWidth = width;
                 mPreviewHeight = height;
-                setTransformMatrix(width, height);
+                setTransformMatrix(mOriginalPreviewWidth, mOriginalPreviewHeight);
                 mAspectRatioResize = false;
             }
-            mCustomVideoMenu.tryToCloseSubList();
+            mVideoMenu.tryToCloseSubList();
         }
     };
 
@@ -196,7 +203,7 @@ public class VideoUI implements PieRenderer.PieListener,
             super.dismiss();
             popupDismissed();
             showUI();
-            mVideoMenu.popupDismissed(topLevelOnly);
+            // mVideoMenu.popupDismissed(topLevelOnly);
 
             // Switch back into fullscreen/lights-out mode after popup
             // is dimissed.
@@ -277,7 +284,7 @@ public class VideoUI implements PieRenderer.PieListener,
         mMenuButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                mCustomVideoMenu.openFirstLevel();
+                mVideoMenu.openFirstLevel();
             }
         });
 
@@ -378,7 +385,6 @@ public class VideoUI implements PieRenderer.PieListener,
                 + ", scaledTextureHeight = " + scaledTextureHeight);
         mTempWidth = (int) scaledTextureWidth;
         mTempHeight = (int) scaledTextureHeight;
-        mSurfaceView.requestLayout();
         mHandler.post(updateSurfaceView);
     }
 
@@ -426,7 +432,7 @@ public class VideoUI implements PieRenderer.PieListener,
     }
 
     public void showUI() {
-        if (!mUIhidden || (mCustomVideoMenu != null && mCustomVideoMenu.isMenuBeingShown()))
+        if (!mUIhidden || (mVideoMenu != null && mVideoMenu.isMenuBeingShown()))
             return;
         mUIhidden = false;
         mCameraControls.showUI();
@@ -448,8 +454,8 @@ public class VideoUI implements PieRenderer.PieListener,
     public boolean collapseCameraControls() {
         boolean ret = false;
         mSwitcher.closePopup();
-        if (mCustomVideoMenu != null) {
-            mCustomVideoMenu.closeAllView();
+        if (mVideoMenu != null) {
+            mVideoMenu.closeAllView();
         }
         if (mPopup != null) {
             dismissPopup(false);
@@ -481,9 +487,9 @@ public class VideoUI implements PieRenderer.PieListener,
 
     public void setDisplayOrientation(int orientation) {
         if ((mPreviewOrientation == -1 || mPreviewOrientation != orientation)
-                && mCustomVideoMenu != null && mCustomVideoMenu.isPreviewMenuBeingShown()) {
+                && mVideoMenu != null && mVideoMenu.isPreviewMenuBeingShown()) {
             dismissSceneModeMenu();
-            mCustomVideoMenu.addModeBack();
+            mVideoMenu.addModeBack();
         }
         mPreviewOrientation = orientation;
     }
@@ -492,6 +498,7 @@ public class VideoUI implements PieRenderer.PieListener,
         ((CameraRootView) mRootView).removeDisplayChangeListener();
     }
 
+// no customvideo?
     public void overrideSettings(final String... keyvalues) {
         if (mVideoMenu != null) {
             mVideoMenu.overrideSettings(keyvalues);
@@ -531,11 +538,11 @@ public class VideoUI implements PieRenderer.PieListener,
         mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay);
         if (mPieRenderer == null) {
             mPieRenderer = new PieRenderer(mActivity);
-            mVideoMenu = new VideoMenu(mActivity, this, mPieRenderer);
+            // mVideoMenu = new VideoMenu(mActivity, this, mPieRenderer);
             mPieRenderer.setPieListener(this);
         }
-        if (mCustomVideoMenu == null) {
-            mCustomVideoMenu = new CustomVideoMenu(mActivity, this);
+        if (mVideoMenu == null) {
+            mVideoMenu = new VideoMenu(mActivity, this);
         }
         mRenderOverlay.addRenderer(mPieRenderer);
         if (mZoomRenderer == null) {
@@ -546,7 +553,7 @@ public class VideoUI implements PieRenderer.PieListener,
             mGestures = new PreviewGestures(mActivity, this, mZoomRenderer, mPieRenderer);
             mRenderOverlay.setGestures(mGestures);
         }
-        mGestures.setCustomVideoMenu(mCustomVideoMenu);
+        mGestures.setVideoMenu(mVideoMenu);
 
         mGestures.setRenderOverlay(mRenderOverlay);
 
@@ -566,7 +573,6 @@ public class VideoUI implements PieRenderer.PieListener,
 
     public void setPrefChangedListener(OnPreferenceChangedListener listener) {
         mVideoMenu.setListener(listener);
-        mCustomVideoMenu.setListener(listener);
     }
 
     private void initializeMiscControls() {
@@ -642,7 +648,7 @@ public class VideoUI implements PieRenderer.PieListener,
     }
 
     public boolean onBackPressed() {
-        if (mCustomVideoMenu != null && mCustomVideoMenu.handleBackKey()) {
+        if (mVideoMenu != null && mVideoMenu.handleBackKey()) {
             return true;
         }
         if (hidePieRenderer()) {
@@ -730,9 +736,9 @@ public class VideoUI implements PieRenderer.PieListener,
         }
         if (animate) {
             if (level == 1)
-                mCustomVideoMenu.animateSlideIn(popup, CameraActivity.SETTING_LIST_WIDTH_1, true);
+                mVideoMenu.animateSlideIn(popup, CameraActivity.SETTING_LIST_WIDTH_1, true);
             if (level == 2)
-                mCustomVideoMenu.animateFadeIn(popup);
+                mVideoMenu.animateFadeIn(popup);
         }
         else
             popup.setAlpha(0.85f);
@@ -832,11 +838,11 @@ public class VideoUI implements PieRenderer.PieListener,
     }
 
     public void hideUIwhileRecording() {
-        mCustomVideoMenu.hideUI();
+        mVideoMenu.hideUI();
     }
 
     public void showUIafterRecording() {
-        mCustomVideoMenu.showUI();
+        mVideoMenu.showUI();
     }
 
     public void showReviewImage(Bitmap bitmap) {
@@ -889,7 +895,6 @@ public class VideoUI implements PieRenderer.PieListener,
 
     public void initializePopup(PreferenceGroup pref) {
         mVideoMenu.initialize(pref);
-        mCustomVideoMenu.initialize(pref);
     }
 
     public void initializeZoom(Parameters param) {