diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml
index 5bab311f7af8a18582c3f9ff585345e7540cf0b9..d04ea3dea711ca2407b35f572e463944c449ae21 100644
--- a/contrib/mobile/Android/AndroidManifest.xml
+++ b/contrib/mobile/Android/AndroidManifest.xml
@@ -1,54 +1,54 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.geuz.onelab"
- android:versionCode="3"
- android:versionName="1.0.2"
- android:installLocation="auto"
- >
-
- <uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="17" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.VIBRATE"/>
- <uses-feature android:glEsVersion="0x00010000" android:required="true" />
-
- <application
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme"
- android:logo="@drawable/ic_launcher"
- android:allowBackup="true" >
- <activity
- android:name=".SplashScreen"
- android:label="@string/title_activity_main">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity
- android:name=".ModelList"
- android:label="@string/title_activity_main" />
- <activity
- android:name=".AboutActivity"
- android:label="@string/title_activity_about" />
- <activity
- android:name=".MainActivity"
- android:label="@string/title_activity_main" >
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msh" android:mimeType="*/*" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.geo" android:mimeType="*/*" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" />
- </intent-filter>
- </activity>
- <activity
- android:name=".PostProcessingActivity"
- android:label="@string/title_activity_main" />
- <activity
- android:name=".OptionsActivity"
- android:label="@string/title_activity_options" />
- </application>
-
+ package="org.geuz.onelab"
+ android:versionCode="3"
+ android:versionName="1.0.5"
+ android:installLocation="auto" >
+
+ <uses-sdk android:minSdkVersion="14"
+ android:targetSdkVersion="17" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
+ <uses-feature android:glEsVersion="0x00010000" android:required="true" />
+
+ <application android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:theme="@style/AppTheme"
+ android:logo="@drawable/ic_launcher"
+ android:allowBackup="true" >
+ <activity android:name=".SplashScreen"
+ android:label="@string/title_activity_main">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <activity android:name=".ModelList"
+ android:label="@string/title_activity_main" />
+ <activity android:name=".AboutActivity"
+ android:label="@string/title_activity_about" />
+ <activity android:name=".MainActivity"
+ android:label="@string/title_activity_main" >
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:scheme="file"
+ android:host="*"
+ android:pathPattern=".*\\.msh"
+ android:mimeType="*/*" />
+ <data android:scheme="file"
+ android:host="*"
+ android:pathPattern=".*\\.geo"
+ android:mimeType="*/*" />
+ <data android:scheme="file"
+ android:host="*"
+ android:pathPattern=".*\\.pro"
+ android:mimeType="*/*" />
+ </intent-filter>
+ </activity>
+ <activity android:name=".PostProcessingActivity"
+ android:label="@string/title_activity_main" />
+ <activity android:name=".OptionsActivity"
+ android:label="@string/title_activity_options" />
+ </application>
+
</manifest>
diff --git a/contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png b/contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png
index 13ba1383cfb684d42ad5e12bd49bfc09ae51e3b6..c8b799020dcd4a7028f1efda3117824840b5db1b 100644
Binary files a/contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png and b/contrib/mobile/Android/res/drawable-hdpi/ic_launcher.png differ
diff --git a/contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png b/contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png
index 09e5479ac7176a8f71b9337c950a52db986e0179..19a3ab1f5693c445ae1a77ea4e1cdb1b58c379cc 100644
Binary files a/contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png and b/contrib/mobile/Android/res/drawable-ldpi/ic_launcher.png differ
diff --git a/contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png b/contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png
index 286d27e00068fb04f4dd541a4daa9b5a28cebd99..262b7f517d3a65478f8bc319f9ae2eee05974024 100644
Binary files a/contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png and b/contrib/mobile/Android/res/drawable-mdpi/ic_launcher.png differ
diff --git a/contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png b/contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png
index 0f0ec77d927c324994704e7064ac2125110060a3..28ae466429a7acf9ea9e4b0ab3f17a84c9668473 100644
Binary files a/contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png and b/contrib/mobile/Android/res/drawable-mdpi/icon_rotate.png differ
diff --git a/contrib/mobile/Android/res/drawable-mdpi/icon_translate.png b/contrib/mobile/Android/res/drawable-mdpi/icon_translate.png
index 2c43ceab43ff0d8214f7b41ba6e47b6566f55e36..acde225dd957e6e02df7557448b4d2a66ebfb032 100644
Binary files a/contrib/mobile/Android/res/drawable-mdpi/icon_translate.png and b/contrib/mobile/Android/res/drawable-mdpi/icon_translate.png differ
diff --git a/contrib/mobile/Android/res/layout/activity_fragment.xml b/contrib/mobile/Android/res/layout/activity_fragment.xml
index 4d2f16d5e390a7938f8cc761c8563f21e0a2e342..4fc7a01d57f810febcdfb3813c4d22a5d49af376 100644
--- a/contrib/mobile/Android/res/layout/activity_fragment.xml
+++ b/contrib/mobile/Android/res/layout/activity_fragment.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/model_fragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginLeft="0dp"
- android:layout_marginRight="0dp" />
\ No newline at end of file
+ android:id="@+id/model_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="0dp"
+ android:layout_marginRight="0dp" />
diff --git a/contrib/mobile/Android/res/layout/activity_model.xml b/contrib/mobile/Android/res/layout/activity_model.xml
index 285d00ebbad157ac0262e102e184b70eaa90fce1..f50072f640926b5e3d6990eeb6d3f9d86f2a49a1 100644
--- a/contrib/mobile/Android/res/layout/activity_model.xml
+++ b/contrib/mobile/Android/res/layout/activity_model.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/model_fragment"
- android:name="org.geuz.onelab.ModelFragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginLeft="0dp"
- android:layout_marginRight="0dp"
- tools:context=".MainActivity" />
\ No newline at end of file
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/model_fragment"
+ android:name="org.geuz.onelab.ModelFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="0dp"
+ android:layout_marginRight="0dp"
+ tools:context=".MainActivity" />
diff --git a/contrib/mobile/Android/res/layout/activity_twopane.xml b/contrib/mobile/Android/res/layout/activity_twopane.xml
index 2b02a4d5e827833dc0c8c49ef4678877ecc916ee..b9ea76e989d3dbcd38fb761d1a520a75e69e1150 100644
--- a/contrib/mobile/Android/res/layout/activity_twopane.xml
+++ b/contrib/mobile/Android/res/layout/activity_twopane.xml
@@ -1,27 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:baselineAligned="false"
- android:divider="?android:attr/dividerHorizontal"
- android:orientation="horizontal"
- android:showDividers="middle"
- tools:context=".MainActivity" >
-
- <FrameLayout android:id="@+id/parameter_fragment"
- android:name="org.geuz.onelab.OptionsDisplayFragment"
- android:layout_marginTop="48dp"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1" />
-
- <FrameLayout android:id="@+id/model_fragment"
- android:name="org.geuz.onelab.ModelFragment"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_marginLeft="0dp"
- android:layout_marginRight="0dp"
- android:layout_weight="3" />
-
-</LinearLayout>
\ No newline at end of file
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="false"
+ android:divider="?android:attr/dividerHorizontal"
+ android:orientation="horizontal"
+ android:showDividers="middle"
+ tools:context=".MainActivity" >
+ <FrameLayout android:id="@+id/parameter_fragment"
+ android:name="org.geuz.onelab.OptionsDisplayFragment"
+ android:layout_marginTop="48dp"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <FrameLayout android:id="@+id/model_fragment"
+ android:name="org.geuz.onelab.ModelFragment"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="0dp"
+ android:layout_marginRight="0dp"
+ android:layout_weight="2" />
+</LinearLayout>
diff --git a/contrib/mobile/Android/res/layout/control_bar.xml b/contrib/mobile/Android/res/layout/control_bar.xml
index 22f76a01b4a66f703cc532677e1dde1e14fd3780..a8a8e0e86c269c3f61660d2e7dd8e8708788ab9f 100644
--- a/contrib/mobile/Android/res/layout/control_bar.xml
+++ b/contrib/mobile/Android/res/layout/control_bar.xml
@@ -1,43 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="@android:color/black"
- android:alpha=".50"
- android:gravity="center" >
- <SeekBar
- android:id="@+id/controlStepper"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal"
- android:background="@android:color/black"
- android:alpha=".50"
- android:gravity="center" >
-
- <ImageButton
- android:id="@+id/controlPrev"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@android:drawable/ic_media_previous"
- android:contentDescription="previous" />
-
- <ImageButton
- android:id="@+id/controlPlay"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@android:drawable/ic_media_play"
- android:contentDescription="play" />
-
- <ImageButton
- android:id="@+id/controlNext"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@android:drawable/ic_media_next"
- android:contentDescription="next" />
-
- </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@android:color/black"
+ android:alpha=".50"
+ android:gravity="center" >
+ <SeekBar android:id="@+id/controlStepper"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:background="@android:color/black"
+ android:alpha=".50"
+ android:gravity="center" >
+
+ <ImageButton android:id="@+id/controlPrev"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@android:drawable/ic_media_previous"
+ android:contentDescription="previous" />
+
+ <ImageButton android:id="@+id/controlPlay"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@android:drawable/ic_media_play"
+ android:contentDescription="play" />
+
+ <ImageButton android:id="@+id/controlNext"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@android:drawable/ic_media_next"
+ android:contentDescription="next" />
+
+ </LinearLayout>
+</LinearLayout>
diff --git a/contrib/mobile/Android/res/layout/fragment_options.xml b/contrib/mobile/Android/res/layout/fragment_options.xml
index d184171ce0a19a5ca9e19a1fcd2d3185ab991d65..01cbbb1f71b45d27da99c070e62f53ded3ef0fe6 100644
--- a/contrib/mobile/Android/res/layout/fragment_options.xml
+++ b/contrib/mobile/Android/res/layout/fragment_options.xml
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:padding="4dip"
- android:gravity="center_horizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <FrameLayout android:id="@+id/options_fragment"
- android:name="org.geuz.onelab.OptionsModelFragment"
- android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="1" />
-
- <View android:layout_width="fill_parent"
- android:layout_height="1dp"
- android:background="@android:color/darker_gray" />
- <LinearLayout android:orientation="horizontal"
+ android:orientation="vertical"
+ android:padding="4dip"
+ android:gravity="center_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <FrameLayout android:id="@+id/options_fragment"
+ android:name="org.geuz.onelab.OptionsModelFragment"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1" />
+
+ <View android:layout_width="fill_parent"
+ android:layout_height="1dp"
+ android:background="@android:color/darker_gray" />
+ <LinearLayout android:orientation="horizontal"
android:gravity="center" android:measureWithLargestChild="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0">
- <Button android:id="@+id/goto_options_model"
+ <Button android:id="@+id/goto_options_model"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Model">
- </Button>
- <Button android:id="@+id/goto_options_display"
+ </Button>
+ <Button android:id="@+id/goto_options_display"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Display">
- </Button>
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+ </Button>
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/contrib/mobile/Android/res/layout/fragment_options_display.xml b/contrib/mobile/Android/res/layout/fragment_options_display.xml
index beba95bd6f41b165e4fa4441fc1040f0b0f46a72..480d0ae008f9aca879026134c34e67d5c14381f3 100644
--- a/contrib/mobile/Android/res/layout/fragment_options_display.xml
+++ b/contrib/mobile/Android/res/layout/fragment_options_display.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<org.geuz.onelab.SeparatedListView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/displayOptionsList">
-
-
-</org.geuz.onelab.SeparatedListView>
\ No newline at end of file
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/displayOptionsList">
+</org.geuz.onelab.SeparatedListView>
diff --git a/contrib/mobile/Android/res/layout/list_header.xml b/contrib/mobile/Android/res/layout/list_header.xml
index bf26b6dcbd24c603ed3e04b11e93c677a95fca52..9244e49ce630879d8152480a6b04f3322bb1064e 100644
--- a/contrib/mobile/Android/res/layout/list_header.xml
+++ b/contrib/mobile/Android/res/layout/list_header.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/list_header_title"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingTop="2dip"
- android:paddingBottom="2dip"
- android:paddingLeft="5dip"
- style="?android:attr/listSeparatorTextViewStyle"
- >
-
-
+ android:id="@+id/list_header_title"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
+ android:paddingLeft="5dip"
+ style="?android:attr/listSeparatorTextViewStyle"
+ >
+
</TextView>
\ No newline at end of file
diff --git a/contrib/mobile/Android/res/layout/splash.xml b/contrib/mobile/Android/res/layout/splash.xml
index 44c7278d0a4e4ebf71956ab92ce4f4220ed04d5a..4091ae15ed8d559215719d311ddfd17aa59a4b8a 100644
--- a/contrib/mobile/Android/res/layout/splash.xml
+++ b/contrib/mobile/Android/res/layout/splash.xml
@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <ImageView android:id="@+id/splashImage"
- android:layout_centerInParent="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@string/app_name"
- android:src="@drawable/ic_launcher" />
- <TextView android:id="@+id/splashTitle"
- android:layout_below="@id/splashImage"
- android:layout_width="fill_parent"
- android:gravity="center"
- android:layout_height="wrap_content"
- android:text="ONELAB for Android"
- android:textSize="24dp"
- android:textStyle="bold"/>
-
-
-
-</RelativeLayout>
\ No newline at end of file
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ <ImageView android:id="@+id/splashImage"
+ android:layout_centerInParent="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/app_name"
+ android:src="@drawable/ic_launcher" />
+</RelativeLayout>
diff --git a/contrib/mobile/Android/res/values/strings.xml b/contrib/mobile/Android/res/values/strings.xml
index b03d59376975f4483316368c154f15c9565c0702..30b32ac37579ea5005aa7a31e7581be87a1c6a3a 100644
--- a/contrib/mobile/Android/res/values/strings.xml
+++ b/contrib/mobile/Android/res/values/strings.xml
@@ -1,21 +1,20 @@
<resources>
-
- <string name="app_name">Onelab</string>
- <string name="button_open_file">Open file</string>
- <string name="button_ok">OK</string>
- <string name="button_recalculate_param">Recalulate with new parameters</string>
- <string name="dialog_title_choosefile">Choose a file</string>
- <string name="error_nosdcard">No SDcard found on your device</string>
- <string name="title_activity_main">Onelab</string>
- <string name="title_activity_about">About</string>
- <string name="title_activity_options">Parameters</string>
- <string name="error_nomshfile">No compatible files or directories in this folder</string>
- <string name="title_share">Share screenshot with …</string>
- <string name="menu_share">Share screenshot</string>
- <string name="menu_parameters">Parameters</string>
- <string name="menu_run">Run</string>
- <string name="menu_stop">Stop</string>
- <string name="postpro_intervalstype">Intervals type</string>
- <string name="postpro_intervals">Intervals</string>
- <string name="postpro_raisez">Raise (Z)</string>
+ <string name="app_name">Onelab</string>
+ <string name="button_open_file">Open file</string>
+ <string name="button_ok">OK</string>
+ <string name="button_recalculate_param">Recompute with new parameters</string>
+ <string name="dialog_title_choosefile">Choose a file</string>
+ <string name="error_nosdcard">No SDcard found on your device</string>
+ <string name="title_activity_main">Onelab</string>
+ <string name="title_activity_about">About</string>
+ <string name="title_activity_options">Parameters</string>
+ <string name="error_nomshfile">No compatible files or directories in this folder</string>
+ <string name="title_share">Share screenshot with …</string>
+ <string name="menu_share">Share screenshot</string>
+ <string name="menu_parameters">Parameters</string>
+ <string name="menu_run">Run</string>
+ <string name="menu_stop">Stop</string>
+ <string name="postpro_intervalstype">Intervals type</string>
+ <string name="postpro_intervals">Intervals</string>
+ <string name="postpro_raisez">Raise (Z)</string>
</resources>
diff --git a/contrib/mobile/Android/res/values/styles.xml b/contrib/mobile/Android/res/values/styles.xml
index 4dba0d0a4c512d8ba1304ee0100e35aa9d78490a..a0978b340d6b44a792c82311da7a19fc86530fca 100644
--- a/contrib/mobile/Android/res/values/styles.xml
+++ b/contrib/mobile/Android/res/values/styles.xml
@@ -1,5 +1,3 @@
<resources>
-
- <style name="AppTheme" parent="android:Theme.Light" />
-
-</resources>
\ No newline at end of file
+ <style name="AppTheme" parent="android:Theme.Light" />
+</resources>