diff options
author | Kenny Root <kenny@the-b.org> | 2014-10-02 23:32:58 +0100 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2014-10-03 00:58:14 +0100 |
commit | db72cbc25b8a7336a2306b8ea19159cc27e388e9 (patch) | |
tree | bffd68bbf00cd8c966c9eca719f00d0f0ce26309 /app/src/main/java/org | |
parent | 3781b14d4eaf7000f85b527cdcfcee17886b3f68 (diff) | |
download | connectbot-db72cbc25b8a7336a2306b8ea19159cc27e388e9.tar.gz connectbot-db72cbc25b8a7336a2306b8ea19159cc27e388e9.tar.bz2 connectbot-db72cbc25b8a7336a2306b8ea19159cc27e388e9.zip |
Revert "Add BuildConfig stuff instead of msg_version"
This reverts commit d2eb6b37b3910f404f229625a39a11954fac681d.
Diffstat (limited to 'app/src/main/java/org')
-rw-r--r-- | app/src/main/java/org/connectbot/HelpActivity.java | 6 | ||||
-rw-r--r-- | app/src/main/java/org/connectbot/WizardActivity.java | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java index f597d7f..d82777d 100644 --- a/app/src/main/java/org/connectbot/HelpActivity.java +++ b/app/src/main/java/org/connectbot/HelpActivity.java @@ -28,7 +28,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.LinearLayout; -import android.widget.TextView; /** * @author Kenny Root @@ -50,10 +49,7 @@ public class HelpActivity extends Activity { getResources().getText(R.string.title_help))); AssetManager am = this.getAssets(); - LinearLayout content = (LinearLayout) findViewById(R.id.topics); - - TextView versionString = (TextView) findViewById(R.id.version); - versionString.setText(BuildConfig.VERSION_NAME); + LinearLayout content = (LinearLayout)this.findViewById(R.id.topics); try { for (String name : am.list(HELPDIR)) { diff --git a/app/src/main/java/org/connectbot/WizardActivity.java b/app/src/main/java/org/connectbot/WizardActivity.java index 711043d..35a60ca 100644 --- a/app/src/main/java/org/connectbot/WizardActivity.java +++ b/app/src/main/java/org/connectbot/WizardActivity.java @@ -26,7 +26,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import android.widget.TextView; import android.widget.ViewFlipper; /** @@ -44,15 +43,11 @@ public class WizardActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.act_wizard); - flipper = (ViewFlipper) findViewById(R.id.wizard_flipper); + this.flipper = (ViewFlipper) findViewById(R.id.wizard_flipper); // inflate the layout for EULA step LayoutInflater inflater = LayoutInflater.from(this); - - View eula = inflater.inflate(R.layout.wiz_eula, flipper, false); - TextView versionString = (TextView) eula.findViewById(R.id.version); - versionString.setText(BuildConfig.VERSION_NAME); - flipper.addView(eula); + this.flipper.addView(inflater.inflate(R.layout.wiz_eula, this.flipper, false)); // Add a view for each help topic we want the user to see. String[] topics = getResources().getStringArray(R.array.list_wizard_topics); |