Clean up GvrPlayerActivity

PiperOrigin-RevId: 274845045

extensions/gvr/src/main/res/layout/vr_ui.xml → extensions/gvr/src/main/res/layout/exo_vr_ui.xml

@@ -13,16 +13,8 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/video_ui_view"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:background="@android:color/black"
-  android:orientation="horizontal"
-  tools:ignore="Overdraw">
-  <com.google.android.exoplayer2.ui.PlayerControlView
+<com.google.android.exoplayer2.ui.PlayerControlView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/controller"
     android:id="@+id/controller"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>
     android:layout_height="match_parent"/>
-</merge>

extensions/gvr/src/main/res/values-v21/styles.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-  <style name="VrTheme" parent="android:Theme.Material"/>
-</resources>

extensions/gvr/src/main/res/values/styles.xml

@@ -14,5 +14,5 @@
      limitations under the License.
      limitations under the License.
 -->
 -->
 <resources>
 <resources>
-  <style name="VrTheme" parent="android:Theme.Holo"/>
+  <style name="ExoVrTheme" parent="android:Theme.DeviceDefault"/>
 </resources>
 </resources>

library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/CanvasRenderer.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-
 package com.google.android.exoplayer2.ui.spherical;
 package com.google.android.exoplayer2.ui.spherical;
 
 
 import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
 import static com.google.android.exoplayer2.util.GlUtil.checkGlError;

library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/GlViewGroup.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-
 package com.google.android.exoplayer2.ui.spherical;
 package com.google.android.exoplayer2.ui.spherical;
 
 
 import android.content.Context;
 import android.content.Context;

library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/PointerRenderer.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-
 package com.google.android.exoplayer2.ui.spherical;
 package com.google.android.exoplayer2.ui.spherical;
 
 
 import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
 import static com.google.android.exoplayer2.util.GlUtil.checkGlError;
@@ -26,7 +25,7 @@ import java.nio.FloatBuffer;
 /** Renders a pointer. */
 /** Renders a pointer. */
 public final class PointerRenderer {
 public final class PointerRenderer {
   // The pointer quad is 2 * SIZE units.
   // The pointer quad is 2 * SIZE units.
-  private static final float SIZE = .01f;
+  private static final float SIZE = 0.01f;
   private static final float DISTANCE = 1;
   private static final float DISTANCE = 1;
 
 
   // Standard vertex shader.
   // Standard vertex shader.

library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalSurfaceView.java

@@ -55,7 +55,7 @@ public final class SphericalSurfaceView extends GLSurfaceView {
 
 
   // Arbitrary vertical field of view.
   // Arbitrary vertical field of view.
   private static final int FIELD_OF_VIEW_DEGREES = 90;
   private static final int FIELD_OF_VIEW_DEGREES = 90;
-  private static final float Z_NEAR = .1f;
+  private static final float Z_NEAR = 0.1f;
   private static final float Z_FAR = 100;
   private static final float Z_FAR = 100;
 
 
   // TODO Calculate this depending on surface size and field of view.
   // TODO Calculate this depending on surface size and field of view.
@@ -84,7 +84,7 @@ public final class SphericalSurfaceView extends GLSurfaceView {
     // Configure sensors and touch.
     // Configure sensors and touch.
     sensorManager =
     sensorManager =
         (SensorManager) Assertions.checkNotNull(context.getSystemService(Context.SENSOR_SERVICE));
         (SensorManager) Assertions.checkNotNull(context.getSystemService(Context.SENSOR_SERVICE));
-    Sensor orientationSensor = null;
+    @Nullable Sensor orientationSensor = null;
     if (Util.SDK_INT >= 18) {
     if (Util.SDK_INT >= 18) {
       // TYPE_GAME_ROTATION_VECTOR is the easiest sensor since it handles all the complex math for
       // TYPE_GAME_ROTATION_VECTOR is the easiest sensor since it handles all the complex math for
       // fusion. It's used instead of TYPE_ROTATION_VECTOR since the latter uses the magnetometer on
       // fusion. It's used instead of TYPE_ROTATION_VECTOR since the latter uses the magnetometer on