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
7c21605e
Commit
7c21605e
authored
10 years ago
by
Xavier Gibert
Browse files
Options
Downloads
Patches
Plain Diff
BUGFIX:TEMPORAL Block menu functions that crash Android 4.4.4
parent
edf38265
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
res/menu/global.xml
+2
-2
2 additions, 2 deletions
res/menu/global.xml
res/menu/main.xml
+2
-2
2 additions, 2 deletions
res/menu/main.xml
src/cs/si/stavor/MainActivity.java
+2
-2
2 additions, 2 deletions
src/cs/si/stavor/MainActivity.java
with
6 additions
and
6 deletions
res/menu/global.xml
+
2
−
2
View file @
7c21605e
...
...
@@ -6,13 +6,13 @@
android:orderInCategory=
"100"
android:title=
"@string/action_about"
app:showAsAction=
"never"
/>
<item
<!--
<item
android:id="@+id/action_reset_conf"
android:title="@string/action_reset_conf"
app:showAsAction="never"/>
<item
android:id="@+id/action_reset_db"
android:title="@string/action_reset_db"
app:showAsAction=
"never"
/>
app:showAsAction="never"/>
-->
</menu>
This diff is collapsed.
Click to expand it.
res/menu/main.xml
+
2
−
2
View file @
7c21605e
...
...
@@ -12,13 +12,13 @@
android:orderInCategory=
"100"
android:title=
"@string/action_about"
app:showAsAction=
"never"
/>
<item
<!--
<item
android:id="@+id/action_reset_conf"
android:title="@string/action_reset_conf"
app:showAsAction="never"/>
<item
android:id="@+id/action_reset_db"
android:title="@string/action_reset_db"
app:showAsAction=
"never"
/>
app:showAsAction="never"/>
-->
</menu>
This diff is collapsed.
Click to expand it.
src/cs/si/stavor/MainActivity.java
+
2
−
2
View file @
7c21605e
...
...
@@ -470,14 +470,14 @@ public class MainActivity extends ActionBarActivity implements
showAbout
();
return
true
;
}
if
(
id
==
R
.
id
.
action_reset_conf
)
{
/*
if (id == R.id.action_reset_conf) {
resetUserConfigShowDialog();
return true;
}
if (id == R.id.action_reset_db) {
resetMissionsDbShowDialog();
return true;
}
}
*/
return
super
.
onOptionsItemSelected
(
item
);
}
...
...
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