diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b1758058f95d34f1ddd2eb3319c835729187d784..9bcb5e7e380ed833b0d805407c97b643dd967eee 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -34,7 +34,7 @@ as that of the covered work. package="org.sflphone" android:installLocation="auto" android:versionCode="13" - android:versionName="1.3.0.2" > + android:versionName="1.4.0" > <supports-screens android:anyDensity="true" diff --git a/jni/sflphone b/jni/sflphone index 646f4be90fdde382c85ab000d2751ade78ea6f39..d8f4adafbf95f1af01cb16a7cbe873b59ef2b95b 160000 --- a/jni/sflphone +++ b/jni/sflphone @@ -1 +1 @@ -Subproject commit 646f4be90fdde382c85ab000d2751ade78ea6f39 +Subproject commit d8f4adafbf95f1af01cb16a7cbe873b59ef2b95b diff --git a/launch-sflphone.sh b/launch-sflphone.sh index e064ba9fec9c6b5c8cd1e3e9afe98cc0cb788259..5694161b8d9782cd751bdca6bf5a5ad3e1b2126d 100755 --- a/launch-sflphone.sh +++ b/launch-sflphone.sh @@ -36,8 +36,8 @@ cd jni/ ndk-build -j4 cd .. -$ANT_HOME clean -$ANT_HOME debug +ant clean +ant debug adb install -r bin/SFLphone-debug.apk diff --git a/project.properties b/project.properties index a3ee5ab64f5e1901414e83e26717725e035b2aae..4ab125693c7c484a0252ee7eca9616e0f9b1ac67 100644 --- a/project.properties +++ b/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17 +target=android-19 diff --git a/src/org/sflphone/fragments/AboutFragment.java b/src/org/sflphone/fragments/AboutFragment.java index 857e21f3a79a9989e006452b946ff1c73a184653..1a13d815cfe8f21e6044d50440179610841f8bbf 100644 --- a/src/org/sflphone/fragments/AboutFragment.java +++ b/src/org/sflphone/fragments/AboutFragment.java @@ -1,15 +1,15 @@ package org.sflphone.fragments; -import android.support.v4.app.Fragment; -import org.sflphone.R; - +import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import org.sflphone.R; public class AboutFragment extends Fragment { @@ -23,6 +23,14 @@ public class AboutFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) { View inflatedView = inflater.inflate(R.layout.frag_about, parent, false); + TextView title = (TextView) inflatedView.findViewById(R.id.app_name); + try { + String versionName = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName; + title.setText(getString(R.string.app_name) + " - " + versionName); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + TextView link = (TextView) inflatedView.findViewById(R.id.web_site); String linkText = "<a href='http://sflphone.org/'>" + getResources().getString(R.string.web_site) + "</a>"; link.setText(Html.fromHtml(linkText));