diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-06-29 21:20:10 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-06-30 11:23:52 +0200 |
commit | 778fe76aca71c4e5c532eb38f27a29a98dc07077 (patch) | |
tree | 2475c79accabe5ae942a2e662d52bc2a7a94af2b /android | |
parent | aea65dc3f97f05d2f4f53da8a2ed8b5a62657bc7 (diff) |
android: suppress deprecation warning for Html.toHtml(String)
deprecated since 24/Nougat, but we still want to support devices running
Marshmallow and older..
Change-Id: Iedcf8a56028eff44134b548dc07a89573cb2210d
Diffstat (limited to 'android')
-rw-r--r-- | android/source/src/java/org/libreoffice/AboutDialogFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java index 9b9a6c7b348f..6c944bae7ef1 100644 --- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java +++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java @@ -21,6 +21,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; import android.text.Html; +import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.view.View; import android.widget.TextView; @@ -56,7 +57,9 @@ public class AboutDialogFragment extends DialogFragment { { String version = String.format(versionView.getText().toString().replace("\n", "<br/>"), tokens[0], "<a href=\"https://hub.libreoffice.org/git-core/" + tokens[1] + "\">" + tokens[1] + "</a>"); - versionView.setText(Html.fromHtml(version)); + @SuppressWarnings("deprecation") // since 24 with additional option parameter + Spanned versionString = Html.fromHtml(version); + versionView.setText(versionString); versionView.setMovementMethod(LinkMovementMethod.getInstance()); String vendor = vendorView.getText().toString(); vendor = vendor.replace("$VENDOR", tokens[2]); |