mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 11:14:01 +02:00
Merge pull request #15047 from amerhifi/quest-demo
case 21477: Execute command line args for Quest testing, profiling, etc
This commit is contained in:
commit
22b18c0c3d
4 changed files with 25 additions and 3 deletions
|
@ -5,6 +5,7 @@ import io.highfidelity.oculus.OculusMobileActivity;
|
||||||
import io.highfidelity.utils.HifiUtils;
|
import io.highfidelity.utils.HifiUtils;
|
||||||
|
|
||||||
public class InterfaceActivity extends OculusMobileActivity {
|
public class InterfaceActivity extends OculusMobileActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
|
HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
|
||||||
|
|
|
@ -5,6 +5,7 @@ import android.app.Activity;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
|
||||||
import io.highfidelity.oculus.OculusMobileActivity;
|
import io.highfidelity.oculus.OculusMobileActivity;
|
||||||
import io.highfidelity.utils.HifiUtils;
|
import io.highfidelity.utils.HifiUtils;
|
||||||
|
@ -19,9 +20,18 @@ public class PermissionsChecker extends Activity {
|
||||||
Manifest.permission.CAMERA
|
Manifest.permission.CAMERA
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private static final String EXTRA_ARGS = "args";
|
||||||
|
private String mArgs;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
mArgs =(getIntent().getStringExtra(EXTRA_ARGS));
|
||||||
|
|
||||||
|
if(!TextUtils.isEmpty(mArgs)) {
|
||||||
|
System.out.println("Application launched with following args: " + mArgs);
|
||||||
|
}
|
||||||
|
|
||||||
requestAppPermissions(REQUIRED_PERMISSIONS,REQUEST_PERMISSIONS);
|
requestAppPermissions(REQUIRED_PERMISSIONS,REQUEST_PERMISSIONS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,7 +57,13 @@ public class PermissionsChecker extends Activity {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void launchActivityWithPermissions() {
|
private void launchActivityWithPermissions() {
|
||||||
startActivity(new Intent(this, InterfaceActivity.class));
|
Intent intent= new Intent(this, InterfaceActivity.class);
|
||||||
|
|
||||||
|
if(!TextUtils.isEmpty(mArgs)) {
|
||||||
|
intent.putExtra("applicationArguments", mArgs);
|
||||||
|
}
|
||||||
|
|
||||||
|
startActivity(intent);
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,11 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
|
||||||
private SurfaceHolder mSurfaceHolder;
|
private SurfaceHolder mSurfaceHolder;
|
||||||
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
|
if(getIntent().hasExtra("applicationArguments")){
|
||||||
|
super.APPLICATION_PARAMETERS=getIntent().getStringExtra("applicationArguments");
|
||||||
|
}
|
||||||
|
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
Log.w(TAG, "QQQ onCreate");
|
Log.w(TAG, "QQQ onCreate");
|
||||||
|
|
Loading…
Reference in a new issue