From 272b941b17a1a588644e80f9e7478b06ec5e1e84 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Thu, 14 Feb 2019 17:14:28 -0800 Subject: [PATCH] removed an obselete variable --- .../java/io/highfidelity/frameplayer/QuestQtActivity.java | 1 - .../java/io/highfidelity/oculus/OculusMobileActivity.java | 6 ------ .../java/org/qtproject/qt5/android/bindings/QtActivity.java | 4 +++- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java index d498e27547..6fed737266 100644 --- a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java +++ b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java @@ -36,7 +36,6 @@ public class QuestQtActivity extends QtActivity { public void launchOculusActivity() { Log.w("QQQ_Qt", "QuestQtActivity::launchOculusActivity"); runOnUiThread(()->{ - keepInterfaceRunning = true; launchedQuestMode = true; moveTaskToBack(true); startActivity(new Intent(this, QuestRenderActivity.class)); diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java index eda656ed30..cc71ba53a8 100644 --- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java +++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java @@ -7,17 +7,11 @@ // package io.highfidelity.oculus; -import android.app.Activity; -import android.content.Intent; import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; import android.util.Log; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; -import android.view.WindowManager; -import android.widget.LinearLayout; import org.qtproject.qt5.android.bindings.QtActivity; import io.highfidelity.utils.HifiUtils; diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java index a5bc9f31f8..46f2af46e7 100644 --- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java @@ -509,7 +509,9 @@ public class QtActivity extends Activity { super.onPause(); // GC: this trick allow us to show a splash activity until Qt app finishes // loading -// QtApplication.invokeDelegate(); + //QtApplication.invokeDelegate(); + + //TODO(Amer): looking into why this messes up pause. } //---------------------------------------------------------------------------