Android Chromoting: Create new namespace cardboard for all Cardboard desktop activity related classes.

BUG=516871

Review URL: https://codereview.chromium.org/1328543002

Cr-Commit-Position: refs/heads/master@{#346735}

12 files changed, 56 insertions, 50 deletions

diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2
index 0d63998..68dffaf 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
@@ -51,7 +51,7 @@
                 android:theme="@style/BaseTheme.Desktop"
                 android:windowSoftInputMode="adjustResize"/>
 {% if ENABLE_CARDBOARD == "1" %}
-        <activity android:name="org.chromium.chromoting.CardboardDesktopActivity"
+        <activity android:name="org.chromium.chromoting.cardboard.DesktopActivity"
                 android:theme="@style/BaseTheme.Desktop"
                 android:windowSoftInputMode="adjustResize"
                 android:screenOrientation="landscape">
diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
index 68219cb..fcc6aee 100644
--- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java
+++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
@@ -19,6 +19,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
+import org.chromium.chromoting.cardboard.DesktopActivity;
 import org.chromium.chromoting.jni.JniInterface;
 
 import java.util.Set;
@@ -204,7 +205,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil
 
         if (id == R.id.actionbar_cardboard) {
             mSwitchToCardboardDesktopActivity = true;
-            Intent intent = new Intent(this, CardboardDesktopActivity.class);
+            Intent intent = new Intent(this, DesktopActivity.class);
             startActivityForResult(intent, Chromoting.CARDBOARD_DESKTOP_ACTIVITY);
             return true;
         }
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopRenderer.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java
index 165fc29..5b3603b 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopRenderer.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
 import android.app.Activity;
 import android.graphics.Point;
@@ -22,7 +22,7 @@ import javax.microedition.khronos.egl.EGLConfig;
 /**
  * Renderer for Cardboard view.
  */
-public class CardboardDesktopRenderer implements CardboardView.StereoRenderer {
+public class CardboardRenderer implements CardboardView.StereoRenderer {
     private static final String TAG = "cr.CardboardRenderer";
 
     private static final int BYTE_PER_FLOAT = 4;
@@ -74,10 +74,10 @@ public class CardboardDesktopRenderer implements CardboardView.StereoRenderer {
     // Eye position at the menu bar distance;
     private PointF mEyeMenuBarPosition;
 
-    private CardboardActivityDesktop mDesktop;
-    private CardboardActivityEyePoint mEyePoint;
-    private CardboardActivitySkybox mSkybox;
-    private CardboardActivityMenuBar mMenuBar;
+    private Desktop mDesktop;
+    private EyePoint mEyePoint;
+    private Skybox mSkybox;
+    private MenuBar mMenuBar;
 
     // Lock for eye position related operations.
     // This protects access to mEyeDesktopPosition.
@@ -86,7 +86,7 @@ public class CardboardDesktopRenderer implements CardboardView.StereoRenderer {
     // Flag to indicate whether to show menu bar.
     private boolean mMenuBarVisible;
 
-    public CardboardDesktopRenderer(Activity activity) {
+    public CardboardRenderer(Activity activity) {
         mActivity = activity;
         mCameraPosition = 0.0f;
 
@@ -123,10 +123,10 @@ public class CardboardDesktopRenderer implements CardboardView.StereoRenderer {
         // Enable depth testing.
         GLES20.glEnable(GLES20.GL_DEPTH_TEST);
 
-        mDesktop = new CardboardActivityDesktop();
-        mEyePoint = new CardboardActivityEyePoint();
-        mSkybox = new CardboardActivitySkybox(mActivity);
-        mMenuBar = new CardboardActivityMenuBar(mActivity);
+        mDesktop = new Desktop();
+        mEyePoint = new EyePoint();
+        mSkybox = new Skybox(mActivity);
+        mMenuBar = new MenuBar(mActivity);
 
         attachRedrawCallback();
     }
@@ -249,7 +249,7 @@ public class CardboardDesktopRenderer implements CardboardView.StereoRenderer {
     /**
      * Return menu item that is currently looking at or null if not looking at menu bar.
      */
-    public CardboardActivityMenuItem getMenuItem() {
+    public MenuItem getMenuItem() {
         // Transform world view to model view.
         return mMenuBar.getLookingItem(new PointF(mEyeMenuBarPosition.x - MENU_BAR_POSITION_X,
                 mEyeMenuBarPosition.y - MENU_BAR_POSITION_Y));
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityUtility.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardUtil.java
index 4363b28..1cc32a0 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityUtility.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardUtil.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -11,7 +11,7 @@ import java.nio.FloatBuffer;
 /**
  * Utility class for Cardboard activity.
  */
-public class CardboardActivityUtility {
+public class CardboardUtil {
     private static final int BYTE_PER_FLOAT = 4;
 
     /**
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityDesktop.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java
index f420488..8a3516c 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityDesktop.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.java
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
-import static org.chromium.chromoting.CardboardActivityUtility.makeFloatBuffer;
-import static org.chromium.chromoting.CardboardActivityUtility.makeRectangularTextureBuffer;
+import static org.chromium.chromoting.cardboard.CardboardUtil.makeFloatBuffer;
+import static org.chromium.chromoting.cardboard.CardboardUtil.makeRectangularTextureBuffer;
 
 import android.graphics.Bitmap;
 import android.graphics.Point;
@@ -18,7 +18,7 @@ import java.nio.FloatBuffer;
 /**
  * Chromoting Cardboard activity desktop, which is used to display host desktop.
  */
-public class CardboardActivityDesktop {
+public class Desktop {
     private static final String VERTEX_SHADER =
             "uniform mat4 u_CombinedMatrix;"
             + "attribute vec4 a_Position;"
@@ -81,7 +81,7 @@ public class CardboardActivityDesktop {
     // Lock to allow multithreaded access to mReloadTexture.
     private final Object mReloadTextureLock = new Object();
 
-    public CardboardActivityDesktop() {
+    public Desktop() {
         mVertexShaderHandle =
                 ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, VERTEX_SHADER);
         mFragmentShaderHandle =
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/DesktopActivity.java
index a92cbed..00c8b33 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/DesktopActivity.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
 import android.content.Intent;
 import android.graphics.PointF;
@@ -14,6 +14,8 @@ import android.speech.SpeechRecognizer;
 import com.google.vrtoolkit.cardboard.CardboardActivity;
 import com.google.vrtoolkit.cardboard.CardboardView;
 
+import org.chromium.chromoting.R;
+import org.chromium.chromoting.TouchInputHandler;
 import org.chromium.chromoting.jni.JniInterface;
 
 import java.util.ArrayList;
@@ -21,12 +23,12 @@ import java.util.ArrayList;
 /**
  * Virtual desktop activity for Cardboard.
  */
-public class CardboardDesktopActivity extends CardboardActivity {
+public class DesktopActivity extends CardboardActivity {
     // Flag to indicate whether the current activity is going to switch to normal
     // desktop activity.
     private boolean mSwitchToDesktopActivity;
 
-    private CardboardDesktopRenderer mRenderer;
+    private CardboardRenderer mRenderer;
     private SpeechRecognizer mSpeechRecognizer;
 
     // Flag to indicate whether the speech recognizer is listening or not.
@@ -38,7 +40,7 @@ public class CardboardDesktopActivity extends CardboardActivity {
         setContentView(R.layout.cardboard_desktop);
         mSwitchToDesktopActivity = false;
         CardboardView cardboardView = (CardboardView) findViewById(R.id.cardboard_view);
-        mRenderer = new CardboardDesktopRenderer(this);
+        mRenderer = new CardboardRenderer(this);
         mIsListening = false;
 
         // Associate a CardboardView.StereoRenderer with cardboardView.
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityEyePoint.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/EyePoint.java
index 0312cad..c43feba 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityEyePoint.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/EyePoint.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
 import android.opengl.GLES20;
 
@@ -10,7 +10,7 @@ import android.opengl.GLES20;
  * Chromoting Cardboard activity eye point, which represents the location on the desktop
  * where user is looking at.
  */
-public class CardboardActivityEyePoint {
+public class EyePoint {
     private static final String VERTEX_SHADER =
             "uniform mat4 u_CombinedMatrix;"
             + "attribute vec4 a_EyePosition;"
@@ -34,7 +34,7 @@ public class CardboardActivityEyePoint {
     private int mCombinedMatrixHandle;
     private int mPositionHandle;
 
-    public CardboardActivityEyePoint() {
+    public EyePoint() {
         // Set handlers for eye point drawing.
         mVertexShaderHandle =
                 ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, VERTEX_SHADER);
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityMenuBar.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/MenuBar.java
index 37b1436..4fe2ee1 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityMenuBar.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/MenuBar.java
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
 import android.content.Context;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.opengl.Matrix;
 
+import org.chromium.chromoting.R;
+
 /**
  * Cardboard activity menu bar that contains multiple menu items.
  */
-public class CardboardActivityMenuBar {
+public class MenuBar {
     public enum MenuItemType {
         HOME(R.drawable.ic_home),
         VOICE_INPUT(R.drawable.ic_voice_input),
@@ -34,12 +36,12 @@ public class CardboardActivityMenuBar {
 
     private final RectF mMenuBarRect;
 
-    private final CardboardActivityMenuItem[] mItems;
+    private final MenuItem[] mItems;
 
     private float[] mModelMatrix;
     private float[] mCombinedMatrix;
 
-    public CardboardActivityMenuBar(Context context) {
+    public MenuBar(Context context) {
         MenuItemType[] menuItemTypes = MenuItemType.values();
         final int numItem = menuItemTypes.length;
         mCombinedMatrix = new float[16];
@@ -51,9 +53,9 @@ public class CardboardActivityMenuBar {
 
         RectF currentRect = new RectF(-halfMenuWidth, -halfMenuHeight,
                 -halfMenuWidth + MENU_ITEM_SIZE, halfMenuHeight);
-        mItems = new CardboardActivityMenuItem[numItem];
+        mItems = new MenuItem[numItem];
         for (int i = 0; i < numItem; i++) {
-            mItems[i] = new CardboardActivityMenuItem(context, menuItemTypes[i], currentRect);
+            mItems[i] = new MenuItem(context, menuItemTypes[i], currentRect);
             currentRect.offset(MENU_ITEM_SIZE, 0);
         }
     }
@@ -63,8 +65,8 @@ public class CardboardActivityMenuBar {
      * Return the CardboardActivity menu item that contains the passed in coordinates or
      * null if none of menu items contains the passed in coordinates.
      */
-    public CardboardActivityMenuItem getLookingItem(PointF lookingPosition) {
-        for (CardboardActivityMenuItem item : mItems) {
+    public MenuItem getLookingItem(PointF lookingPosition) {
+        for (MenuItem item : mItems) {
             if (item.contains(lookingPosition)) {
                 return item;
             }
@@ -75,7 +77,7 @@ public class CardboardActivityMenuBar {
 
     public void draw(float[] viewMatrix, float[] projectionMatrix, PointF eyeMenuBarPosition,
             float centerX, float centerY, float centerZ) {
-        for (CardboardActivityMenuItem item : mItems) {
+        for (MenuItem item : mItems) {
             Matrix.setIdentityM(mModelMatrix, 0);
             Matrix.translateM(mModelMatrix, 0, item.getPosition().x + centerX,
                     item.getPosition().y + centerY, centerZ);
@@ -98,7 +100,7 @@ public class CardboardActivityMenuBar {
      * Clean up opengl data.
      */
     public void cleanup() {
-        for (CardboardActivityMenuItem item : mItems) {
+        for (MenuItem item : mItems) {
             item.clean();
         }
     }
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityMenuItem.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/MenuItem.java
index a12fa5d..200f776 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityMenuItem.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/MenuItem.java
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
-import static org.chromium.chromoting.CardboardActivityUtility.makeFloatBuffer;
-import static org.chromium.chromoting.CardboardActivityUtility.makeRectangularTextureBuffer;
+import static org.chromium.chromoting.cardboard.CardboardUtil.makeFloatBuffer;
+import static org.chromium.chromoting.cardboard.CardboardUtil.makeRectangularTextureBuffer;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -14,14 +14,14 @@ import android.graphics.PointF;
 import android.graphics.RectF;
 import android.opengl.GLES20;
 
-import org.chromium.chromoting.CardboardActivityMenuBar.MenuItemType;
+import org.chromium.chromoting.cardboard.MenuBar.MenuItemType;
 
 import java.nio.FloatBuffer;
 
 /**
  * Cardboard activity menu item representing a corresponding function.
  */
-public class CardboardActivityMenuItem {
+public class MenuItem {
     private static final String VERTEX_SHADER =
             "uniform mat4 u_CombinedMatrix;"
             + "attribute vec4 a_Position;"
@@ -74,7 +74,7 @@ public class CardboardActivityMenuItem {
 
     private RectF mRect;
 
-    public CardboardActivityMenuItem(Context context, MenuItemType type, RectF rect) {
+    public MenuItem(Context context, MenuItemType type, RectF rect) {
         mType = type;
         mRect = new RectF(rect);
         float halfHeight = mRect.height() / 2;
diff --git a/remoting/android/java/src/org/chromium/chromoting/ShaderHelper.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/ShaderHelper.java
index 9c05aac..5bc25b5 100644
--- a/remoting/android/java/src/org/chromium/chromoting/ShaderHelper.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/ShaderHelper.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
 import android.opengl.GLES20;
 
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardActivitySkybox.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/Skybox.java
index 9de022ac..b7d09d3 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardActivitySkybox.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/Skybox.java
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
-import static org.chromium.chromoting.CardboardActivityUtility.makeFloatBuffer;
+import static org.chromium.chromoting.cardboard.CardboardUtil.makeFloatBuffer;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
@@ -12,6 +12,7 @@ import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
 
 import org.chromium.base.Log;
+import org.chromium.chromoting.ChromotingDownloadManager;
 
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
@@ -19,7 +20,7 @@ import java.nio.FloatBuffer;
 /**
  * Cardboard Activity skybox, which is used to draw the activity environment.
  */
-public class CardboardActivitySkybox {
+public class Skybox {
     private static final String TAG = "cr.CardboardSkybox";
 
     private static final String VERTEX_SHADER =
@@ -118,7 +119,7 @@ public class CardboardActivitySkybox {
 
     ChromotingDownloadManager mDownloadManager;
 
-    public CardboardActivitySkybox(Activity activity) {
+    public Skybox(Activity activity) {
         mActivity = activity;
 
         GLES20.glEnable(GLES20.GL_TEXTURE_CUBE_MAP);
diff --git a/remoting/android/java/src/org/chromium/chromoting/TextureHelper.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/TextureHelper.java
index fb710eb..82b852a 100644
--- a/remoting/android/java/src/org/chromium/chromoting/TextureHelper.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/TextureHelper.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chromoting;
+package org.chromium.chromoting.cardboard;
 
 import static android.opengl.GLES20.GL_LINEAR;
 import static android.opengl.GLES20.GL_NEAREST;