Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Support Daydream VR transition #74

Merged
merged 2 commits into from
May 3, 2019
Merged

Support Daydream VR transition #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dce6a3
Add makefile to regenerate AAR easily.
jdm May 3, 2019
ca45fff
Keep track of pause/resume of GVR activity.
jdm May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified rust-webvr/src/api/googlevr/aar/GVRService.aar
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions rust-webvr/src/api/googlevr/gradle/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
SOURCES = \
src/main/java/com/rust/webvr/GVRService.java \
src/main/AndroidManifest.xml \
build.gradle \
settings.gradle \
gradle/wrapper/gradle-wrapper.properties \
gradle/wrapper/gradle-wrapper.jar

OUTPUT_AAR = build/outputs/aar/GVRService-release.aar
FINAL_AAR = ../aar/GVRService.aar

all: $(FINAL_AAR)

$(OUTPUT_AAR): $(SOURCES)
./gradlew assembleRelease && touch $(OUTPUT_AAR)

$(FINAL_AAR): $(OUTPUT_AAR)
cp $(OUTPUT_AAR) $(FINAL_AAR)
9 changes: 7 additions & 2 deletions rust-webvr/src/api/googlevr/gradle/src/main/java/com/rust/webvr/GVRService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class GVRService implements Application.ActivityLifecycleCallbacks {
private GvrLayout gvrLayout;
private long mPtr = 0; // Native Rustlang struct pointer
private boolean mPresenting = false;
private boolean mPaused = false;
private boolean mGvrResumed = false;

private static native void nativeOnPause(long ptr);
Expand Down Expand Up @@ -73,7 +74,9 @@ private void start() {

mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
mActivity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
AndroidCompat.setVrModeEnabled(mActivity, true);
if (!AndroidCompat.setVrModeEnabled(mActivity, true)) {
Log.w("rust-webvr", "setVrModeEnabled failed");
}

// Show GvrLayout
FrameLayout rootLayout = (FrameLayout)mActivity.findViewById(android.R.id.content);
Expand Down Expand Up @@ -134,9 +137,10 @@ public void onActivityStarted(Activity activity) {
if (activity != mActivity) {
return;
}
if (mPresenting && gvrLayout != null && !mGvrResumed) {
if (mPaused && gvrLayout != null && !mGvrResumed) {
gvrLayout.onResume();
mGvrResumed = true;
mPaused = false;
nativeOnResume(mPtr);
}
}
Expand All @@ -160,6 +164,7 @@ public void onActivityStopped(Activity activity) {
if (mPresenting && gvrLayout != null && mGvrResumed) {
gvrLayout.onPause();
mGvrResumed = false;
mPaused = true;
nativeOnPause(mPtr);
}
}
Expand Down