sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-27 09:45:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few GVR 360 nits

Browse source 
- Remove unused TAG
- android.Theme.Material can only be used from API level 21
- Rm "Base" from activity name for consistency

PiperOrigin-RevId: 233410603
This commit is contained in:
olly 2019-02-11 16:19:01 +00:00 committed by Andrew Lewis
parent ae12b76ac4
commit 71ab19c771
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/BaseGvrPlayerActivity.java → extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrPlayerActivity.java
View file

@ -50,9 +50,8 @@ import com.google.vr.sdk.controller.ControllerManager;
import javax.microedition.khronos.egl.EGLConfig;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** VR 360 video player base activity class. */
public abstract class BaseGvrPlayerActivity extends GvrActivity {
private static final String TAG = "GvrPlayerActivity";
/** Base activity for VR 360 video playback. */
public abstract class GvrPlayerActivity extends GvrActivity {
private static final int EXIT_FROM_VR_REQUEST_CODE = 42;
@ -66,7 +65,7 @@ public abstract class BaseGvrPlayerActivity extends GvrActivity {
@MonotonicNonNull private SceneRenderer scene;
@MonotonicNonNull private PlayerControlView playerControl;
public BaseGvrPlayerActivity() {
public GvrPlayerActivity() {
mainHandler = new Handler(Looper.getMainLooper());
}
@ -348,7 +347,7 @@ public abstract class BaseGvrPlayerActivity extends GvrActivity {
}
});
} else if (!appButtonDown && controller.appButtonState) {
glView.post(BaseGvrPlayerActivity.this::togglePlayerControlVisibility);
glView.post(GvrPlayerActivity.this::togglePlayerControlVisibility);
}
appButtonDown = controller.appButtonState;
}

18
extensions/gvr/src/main/res/values-v21/styles.xml Normal file
View file

@ -0,0 +1,18 @@
<?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>

5
extensions/gvr/src/main/res/values/styles.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 The Android Open Source Project
<!-- Copyright (C) 2019 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.
@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Android Views rendered in VR should use a theme that matches the rest of the VR UI.-->
<resources>
<style name="VrTheme" parent="android:Theme.Material"/>
<style name="VrTheme" parent="android:Theme.Holo"/>
</resources>