Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
Stavor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Orekit
Stavor
Commits
dd490052
Commit
dd490052
authored
10 years ago
by
Xavier Gibert
Browse files
Options
Downloads
Patches
Plain Diff
BugFix
parent
b2a9de3b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/cs/si/stavor/MainActivity.java
+7
-2
7 additions, 2 deletions
src/cs/si/stavor/MainActivity.java
with
7 additions
and
2 deletions
src/cs/si/stavor/MainActivity.java
+
7
−
2
View file @
dd490052
...
...
@@ -104,7 +104,8 @@ public class MainActivity extends ActionBarActivity implements
public
void
raiseLoadBrowserFlag
(){
loadBrowser
=
true
;
}
// to know when the oncreate and onresume are triggered for the first time
private
boolean
flagActivityFirstExec
=
false
;
public
boolean
flag_show_welcome
=
false
;
...
...
@@ -130,6 +131,7 @@ public class MainActivity extends ActionBarActivity implements
// create the fragment and data the first time
if
(
dataFragment
==
null
)
{
flagActivityFirstExec
=
true
;
// add the fragment
dataFragment
=
new
RetainedFragment
();
fm
.
beginTransaction
().
add
(
dataFragment
,
"data"
).
commit
();
...
...
@@ -484,7 +486,10 @@ public class MainActivity extends ActionBarActivity implements
protected
void
onResume
()
{
//Resume browser
super
.
onResume
();
mXwalkView
.
addJavascriptInterface
(
new
WebAppInterface
(
this
,
simulator
.
getSimulationResults
()),
"Android"
);
mXwalkView
.
load
(
Parameters
.
Web
.
STARTING_PAGE
,
null
);
if
(
flagActivityFirstExec
){
mXwalkView
.
load
(
Parameters
.
Web
.
STARTING_PAGE
,
null
);
flagActivityFirstExec
=
false
;
}
}
@Override
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment