1 files changed, 30 insertions, 30 deletions

diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index f4f8296ab..ce461aadd 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -21,8 +21,8 @@ import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.View;
 
-import com.android.camera.CustomPhotoMenu;
-import com.android.camera.CustomVideoMenu;
+import com.android.camera.PhotoMenu;
+import com.android.camera.VideoMenu;
 import com.android.camera.ui.PieRenderer;
 import com.android.camera.ui.RenderOverlay;
 import com.android.camera.ui.ZoomRenderer;
@@ -56,8 +56,8 @@ public class PreviewGestures
     private boolean mEnabled;
     private boolean mZoomOnly;
     private GestureDetector mGestureDetector;
-    private CustomPhotoMenu mCustomPhotoMenu;
-    private CustomVideoMenu mCustomVideoMenu;
+    private PhotoMenu mPhotoMenu;
+    private VideoMenu mVideoMenu;
     private boolean waitUntilNextDown;
     private boolean setToFalse;
 
@@ -100,15 +100,15 @@ public class PreviewGestures
             if (deltaX < 0 && Math.abs(deltaX) > 2 * Math.abs(deltaY)) {
                 // Open menu on swipe left
                 waitUntilNextDown = true;
-                if (mCustomPhotoMenu != null) {
-                    if (!mCustomPhotoMenu.isMenuBeingShown()) {
-                        mCustomPhotoMenu.openFirstLevel();
+                if (mPhotoMenu != null) {
+                    if (!mPhotoMenu.isMenuBeingShown()) {
+                        mPhotoMenu.openFirstLevel();
                     }
                 }
 
-                if (mCustomVideoMenu != null) {
-                    if (!mCustomVideoMenu.isMenuBeingShown()) {
-                        mCustomVideoMenu.openFirstLevel();
+                if (mVideoMenu != null) {
+                    if (!mVideoMenu.isMenuBeingShown()) {
+                        mVideoMenu.openFirstLevel();
                     }
                 }
                 return true;
@@ -152,20 +152,20 @@ public class PreviewGestures
         return mEnabled;
     }
 
-    public void setCustomPhotoMenu(CustomPhotoMenu menu) {
-        mCustomPhotoMenu = menu;
+    public void setPhotoMenu(PhotoMenu menu) {
+        mPhotoMenu = menu;
     }
 
-    public void setCustomVideoMenu(CustomVideoMenu menu) {
-        mCustomVideoMenu = menu;
+    public void setVideoMenu(VideoMenu menu) {
+        mVideoMenu = menu;
     }
 
-    public CustomPhotoMenu getCustomPhotoMenu() {
-        return mCustomPhotoMenu;
+    public PhotoMenu getPhotoMenu() {
+        return mPhotoMenu;
     }
 
-    public CustomVideoMenu getCustomVideoMenu() {
-        return mCustomVideoMenu;
+    public VideoMenu getVideoMenu() {
+        return mVideoMenu;
     }
 
     public boolean dispatchTouch(MotionEvent m) {
@@ -196,33 +196,33 @@ public class PreviewGestures
             return sendToPie(m);
         }
 
-        if (mCustomPhotoMenu != null) {
-            if (mCustomPhotoMenu.isMenuBeingShown()) {
-                if (!mCustomPhotoMenu.isMenuBeingAnimated()) {
+        if (mPhotoMenu != null) {
+            if (mPhotoMenu.isMenuBeingShown()) {
+                if (!mPhotoMenu.isMenuBeingAnimated()) {
                     waitUntilNextDown = true;
-                    mCustomPhotoMenu.closeView();
+                    mPhotoMenu.closeView();
                 }
                 return true;
             }
-            if (mCustomPhotoMenu.isPreviewMenuBeingShown()) {
+            if (mPhotoMenu.isPreviewMenuBeingShown()) {
                 waitUntilNextDown = true;
-                mCustomPhotoMenu.animateSlideOutPreviewMenu();
+                mPhotoMenu.animateSlideOutPreviewMenu();
                 return true;
             }
         }
 
-        if (mCustomVideoMenu != null) {
-            if (mCustomVideoMenu.isMenuBeingShown()) {
-                if (!mCustomVideoMenu.isMenuBeingAnimated()) {
+        if (mVideoMenu != null) {
+            if (mVideoMenu.isMenuBeingShown()) {
+                if (!mVideoMenu.isMenuBeingAnimated()) {
                     waitUntilNextDown = true;
-                    mCustomVideoMenu.closeView();
+                    mVideoMenu.closeView();
                 }
                 return true;
             }
 
-            if (mCustomVideoMenu.isPreviewMenuBeingShown()) {
+            if (mVideoMenu.isPreviewMenuBeingShown()) {
                 waitUntilNextDown = true;
-                mCustomVideoMenu.animateSlideOutPreviewMenu();
+                mVideoMenu.animateSlideOutPreviewMenu();
                 return true;
             }
         }