Mercurial > 510Connectbot

changeset 256:29a431920007

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help shows full version info
author Carl Byington <carl@five-ten-sg.com>
date Mon, 14 Jul 2014 14:11:09 -0700
parents 67f9a819157e
children 8a6c7c7ffe0d
files res/layout/act_help.xml res/layout/wiz_eula.xml src/com/five_ten_sg/connectbot/HelpActivity.java src/com/five_ten_sg/connectbot/WizardActivity.java
diffstat 4 files changed, 2 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/res/layout/act_help.xml	Mon Jul 14 13:02:34 2014 -0700
+++ b/res/layout/act_help.xml	Mon Jul 14 14:11:09 2014 -0700
@@ -34,10 +34,9 @@
 		>
 
 		<TextView
-			android:id="@string/msg_version"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:text=""
+			android:text="@string/msg_version"
 			android:paddingTop="2dip"
 			android:textAppearance="?android:attr/textAppearanceSmall"
 			android:gravity="right"
--- a/res/layout/wiz_eula.xml	Mon Jul 14 13:02:34 2014 -0700
+++ b/res/layout/wiz_eula.xml	Mon Jul 14 14:11:09 2014 -0700
@@ -65,11 +65,10 @@
             />
 
         <TextView
-            android:id="@+id/app_version"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:paddingTop="10dip"
-            android:text=""
+            android:text="@string/msg_version"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
 
--- a/src/com/five_ten_sg/connectbot/HelpActivity.java	Mon Jul 14 13:02:34 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/HelpActivity.java	Mon Jul 14 14:11:09 2014 -0700
@@ -50,16 +50,6 @@
                                     getResources().getText(R.string.title_help)));
         AssetManager am = this.getAssets();
         LinearLayout content = (LinearLayout)this.findViewById(R.id.topics);
-        TextView appVersionView = (TextView) this.findViewById(R.id.topics).findViewById(R.id.app_version);
-
-        // get package version
-        try {
-            appVersionView.setText(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
-        }
-        catch (NameNotFoundException e) {
-            Log.e(TAG, "Problem retrieving application version", e);
-        }
-
         try {
             for (String name : am.list(HELPDIR)) {
                 if (name.endsWith(SUFFIX)) {
--- a/src/com/five_ten_sg/connectbot/WizardActivity.java	Mon Jul 14 13:02:34 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/WizardActivity.java	Mon Jul 14 14:11:09 2014 -0700
@@ -48,15 +48,6 @@
         // inflate the layout for EULA step
         LayoutInflater inflater = LayoutInflater.from(this);
         View helpView = inflater.inflate(R.layout.wiz_eula, this.flipper, false);
-        TextView appVersionView = (TextView) helpView.findViewById(R.id.app_version);
-
-        // get package version
-        try {
-            appVersionView.setText(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
-        }
-        catch (NameNotFoundException e) {
-            Log.e(TAG, "Problem retrieving application version", e);
-        }
 
         this.flipper.addView(helpView);
         // Add a view for each help topic we want the user to see.