Merge "Gallery: Fix DDM UI issue"

2 files changed, 8 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java b/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java
index c1212fac6..7a172116a 100755
--- a/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java
+++ b/src/com/android/gallery3d/app/dualcam3d/ThreeDimensionalActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -46,7 +46,7 @@ import com.android.gallery3d.filtershow.tools.DualCameraNativeEngine;
 import org.codeaurora.gallery.R;
 
 public class ThreeDimensionalActivity extends Activity {
-    private static final String TAG = "DualCamDemo";
+    private static final String TAG = ThreeDimensionalActivity.class.getSimpleName();
 
     final static int MSG_UPDATE_IMAGE = 1;
     final static int MSG_UPDATE_3D_DEPTH_MAP = 2;
@@ -180,4 +180,4 @@ public class ThreeDimensionalActivity extends Activity {
     public Controller getController() {
         return new Controller(mImageView, (LinearLayout) findViewById(R.id.mode_3d));
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java b/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java
index 72f6b1141..ff86d2bf5 100755
--- a/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java
+++ b/src/com/android/gallery3d/app/dualcam3d/threed/Controller.java
@@ -31,6 +31,7 @@ package com.android.gallery3d.app.dualcam3d.threed;
 
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 
 import com.android.gallery3d.app.dualcam3d.GLView;
@@ -65,11 +66,14 @@ public class Controller implements Gyro.Listener {
                     case R.id.mode_touch:
                         stop(false);
                         break;
+                    case R.id.three_dimensional:
+                        start();
+                        break;
                 }
             }
         };
         for (int i = modeView.getChildCount() - 1; i >= 0; --i) {
-            Button b = (Button) modeView.getChildAt(i);
+            ImageButton b = (ImageButton) modeView.getChildAt(i);
             b.setOnClickListener(listener);
         }
     }