commit 546ba36de6f30d9a20097f06c578e221b977a8fc
author Likai Ding <likaid@codeaurora.org> Fri Nov 21 01:52:54 2014 +0800
committer Likai Ding <likaid@codeaurora.org> Fri Nov 21 01:52:54 2014 +0800
tree 8b3345d94d8ef5a86e4e9bdccf79afe60bce4b4b
parent c5e02ba64e40b6ba406922e655749f048e226e51

Revert "SnapdragonCamera: Add back missing setting menus"

This reverts commit 673e935015a954e7cb40201408199a22f1aa63a9.

src/com/android/camera/VideoUI.java

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 80ba0c0..6dd793d 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -103,6 +103,7 @@
     private LinearLayout mMenuLayout;
     private LinearLayout mSubMenuLayout;
     private LinearLayout mPreviewMenuLayout;
+    private CustomVideoMenu mCustomVideoMenu;
 
     private View mPreviewCover;
     private SurfaceView mSurfaceView = null;
@@ -172,7 +173,7 @@
                 setTransformMatrix(width, height);
                 mAspectRatioResize = false;
             }
-            mVideoMenu.tryToCloseSubList();
+            mCustomVideoMenu.tryToCloseSubList();
         }
     };
 
@@ -195,7 +196,7 @@
             super.dismiss();
             popupDismissed();
             showUI();
-            // mVideoMenu.popupDismissed(topLevelOnly);
+            mVideoMenu.popupDismissed(topLevelOnly);
 
             // Switch back into fullscreen/lights-out mode after popup
             // is dimissed.
@@ -276,7 +277,7 @@
         mMenuButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                mVideoMenu.openFirstLevel();
+                mCustomVideoMenu.openFirstLevel();
             }
         });
 
@@ -425,7 +426,7 @@
     }
 
     public void showUI() {
-        if (!mUIhidden || (mVideoMenu != null && mVideoMenu.isMenuBeingShown()))
+        if (!mUIhidden || (mCustomVideoMenu != null && mCustomVideoMenu.isMenuBeingShown()))
             return;
         mUIhidden = false;
         mCameraControls.showUI();
@@ -447,8 +448,8 @@
     public boolean collapseCameraControls() {
         boolean ret = false;
         mSwitcher.closePopup();
-        if (mVideoMenu != null) {
-            mVideoMenu.closeAllView();
+        if (mCustomVideoMenu != null) {
+            mCustomVideoMenu.closeAllView();
         }
         if (mPopup != null) {
             dismissPopup(false);
@@ -480,9 +481,9 @@
 
     public void setDisplayOrientation(int orientation) {
         if ((mPreviewOrientation == -1 || mPreviewOrientation != orientation)
-                && mVideoMenu != null && mVideoMenu.isPreviewMenuBeingShown()) {
+                && mCustomVideoMenu != null && mCustomVideoMenu.isPreviewMenuBeingShown()) {
             dismissSceneModeMenu();
-            mVideoMenu.addModeBack();
+            mCustomVideoMenu.addModeBack();
         }
         mPreviewOrientation = orientation;
     }
@@ -491,7 +492,6 @@
         ((CameraRootView) mRootView).removeDisplayChangeListener();
     }
 
-// no customvideo?
     public void overrideSettings(final String... keyvalues) {
         if (mVideoMenu != null) {
             mVideoMenu.overrideSettings(keyvalues);
@@ -531,11 +531,11 @@
         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 (mVideoMenu == null) {
-            mVideoMenu = new VideoMenu(mActivity, this);
+        if (mCustomVideoMenu == null) {
+            mCustomVideoMenu = new CustomVideoMenu(mActivity, this);
         }
         mRenderOverlay.addRenderer(mPieRenderer);
         if (mZoomRenderer == null) {
@@ -546,7 +546,7 @@
             mGestures = new PreviewGestures(mActivity, this, mZoomRenderer, mPieRenderer);
             mRenderOverlay.setGestures(mGestures);
         }
-        mGestures.setVideoMenu(mVideoMenu);
+        mGestures.setCustomVideoMenu(mCustomVideoMenu);
 
         mGestures.setRenderOverlay(mRenderOverlay);
 
@@ -566,6 +566,7 @@
 
     public void setPrefChangedListener(OnPreferenceChangedListener listener) {
         mVideoMenu.setListener(listener);
+        mCustomVideoMenu.setListener(listener);
     }
 
     private void initializeMiscControls() {
@@ -641,7 +642,7 @@
     }
 
     public boolean onBackPressed() {
-        if (mVideoMenu != null && mVideoMenu.handleBackKey()) {
+        if (mCustomVideoMenu != null && mCustomVideoMenu.handleBackKey()) {
             return true;
         }
         if (hidePieRenderer()) {
@@ -729,9 +730,9 @@
         }
         if (animate) {
             if (level == 1)
-                mVideoMenu.animateSlideIn(popup, CameraActivity.SETTING_LIST_WIDTH_1, true);
+                mCustomVideoMenu.animateSlideIn(popup, CameraActivity.SETTING_LIST_WIDTH_1, true);
             if (level == 2)
-                mVideoMenu.animateFadeIn(popup);
+                mCustomVideoMenu.animateFadeIn(popup);
         }
         else
             popup.setAlpha(0.85f);
@@ -836,11 +837,11 @@
     }
 
     public void hideUIwhileRecording() {
-        mVideoMenu.hideUI();
+        mCustomVideoMenu.hideUI();
     }
 
     public void showUIafterRecording() {
-        mVideoMenu.showUI();
+        mCustomVideoMenu.showUI();
     }
 
     public void showReviewImage(Bitmap bitmap) {
@@ -893,6 +894,7 @@
 
     public void initializePopup(PreferenceGroup pref) {
         mVideoMenu.initialize(pref);
+        mCustomVideoMenu.initialize(pref);
     }
 
     public void initializeZoom(Parameters param) {