From 9b88279212bcf067ac922df2784fcd7a05915470 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 7 May 2017 16:05:36 -0700 Subject: [PATCH] remove need for file app_name.xml's contents are in generated file, so just use that. Saves a change on each release. --- .../src/main/java/org/eehouse/android/xw4/AboutAlert.java | 2 +- xwords4/android/app/src/main/res/values/app_name.xml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 xwords4/android/app/src/main/res/values/app_name.xml diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java index c19ad0198..c4478326e 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java @@ -56,7 +56,7 @@ public class AboutAlert extends XWDialogFragment { String dateString = df.format( new Date( BuildConfig.BUILD_STAMP * 1000 ) ); vers.setText( getString( R.string.about_vers_fmt, - getString( R.string.app_version ), + BuildConfig.VERSION_NAME, BuildConfig.GIT_REV, dateString ) ); TextView xlator = (TextView)view.findViewById( R.id.about_xlator ); diff --git a/xwords4/android/app/src/main/res/values/app_name.xml b/xwords4/android/app/src/main/res/values/app_name.xml deleted file mode 100644 index 310a94713..000000000 --- a/xwords4/android/app/src/main/res/values/app_name.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - 4.4.116 -