This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc

1 files changed, 5 insertions, 5 deletions

diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index 6e4321571..f9e78f069 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -35,10 +35,10 @@ import android.widget.FrameLayout.LayoutParams;
 import android.widget.LinearLayout;
 
 import com.android.camera.Util;
-import com.android.gallery3d.R;
+import com.android.camera.util.PhotoSphereHelper;
+import com.android.camera.util.UsageStatistics;
+import com.android.camera2.R;
 import com.android.gallery3d.common.ApiHelper;
-import com.android.gallery3d.util.LightCycleHelper;
-import com.android.gallery3d.util.UsageStatistics;
 
 public class CameraSwitcher extends RotateImageView
         implements OnClickListener, OnTouchListener {
@@ -96,14 +96,14 @@ public class CameraSwitcher extends RotateImageView
     }
 
     public void initializeDrawables(Context context) {
-        int totaldrawid = (LightCycleHelper.hasLightCycleCapture(context)
+        int totaldrawid = (PhotoSphereHelper.hasLightCycleCapture(context)
                 ? DRAW_IDS.length : DRAW_IDS.length - 1);
 
         int[] drawids = new int[totaldrawid];
         int[] moduleids = new int[totaldrawid];
         int ix = 0;
         for (int i = 0; i < DRAW_IDS.length; i++) {
-            if (i == LIGHTCYCLE_MODULE_INDEX && !LightCycleHelper.hasLightCycleCapture(context)) {
+            if (i == LIGHTCYCLE_MODULE_INDEX && !PhotoSphereHelper.hasLightCycleCapture(context)) {
                 continue; // not enabled, so don't add to UI
             }
             moduleids[ix] = i;