diff --git a/android/source/res/layout/about.xml b/android/source/res/layout/about.xml index 8cce41cf076d..30f1ed3d95ae 100644 --- a/android/source/res/layout/about.xml +++ b/android/source/res/layout/about.xml @@ -38,7 +38,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textIsSelectable="true" - android:text="@string/app_vendor" android:textSize="18sp"/> diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java index de2e48ffbdde..b215ab5e7601 100644 --- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java +++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java @@ -40,8 +40,7 @@ public class AboutDialogFragment extends DialogFragment { int defaultColor = textView.getTextColors().getDefaultColor(); textView.setTextColor(defaultColor); - // Take care of placeholders in the version and vendor text views. - TextView vendorView = messageView.findViewById(R.id.about_vendor); + // Take care of placeholders and set text in version and vendor text views. try { String versionName = getActivity().getPackageManager() @@ -55,8 +54,8 @@ public class AboutDialogFragment extends DialogFragment { TextView versionView = messageView.findViewById(R.id.about_version); versionView.setText(versionString); versionView.setMovementMethod(LinkMovementMethod.getInstance()); - String vendor = vendorView.getText().toString(); - vendor = vendor.replace("$VENDOR", tokens[2]); + TextView vendorView = messageView.findViewById(R.id.about_vendor); + String vendor = getString(R.string.app_vendor).replace("$VENDOR", tokens[2]); vendorView.setText(vendor); } else @@ -64,7 +63,6 @@ public class AboutDialogFragment extends DialogFragment { } catch (PackageManager.NameNotFoundException e) { - vendorView.setText(""); } AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());