aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Klein <jklein24@gmail.com>2015-10-06 14:40:44 -0700
committerJeremy Klein <jklein24@gmail.com>2015-10-06 14:40:44 -0700
commitfde40fdcb62c764df90e889ae95e28b86ac5f746 (patch)
treeaf7e711805174e375033dc3ea2ad3fbc2bfd7036
parent1f80f1ea2797805bdecf15e2ce50823c9bc4e369 (diff)
parent4753e1cbbe490d2b2f8c3a16d59e3aff9f554cd7 (diff)
downloadconnectbot-fde40fdcb62c764df90e889ae95e28b86ac5f746.tar.gz
connectbot-fde40fdcb62c764df90e889ae95e28b86ac5f746.tar.bz2
connectbot-fde40fdcb62c764df90e889ae95e28b86ac5f746.zip
Merge pull request #278 from rhansby/correct-launcher-appname
Display correct app name in launcher.
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--app/src/main/java/org/connectbot/HostListActivity.java1
2 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95177fc..dd9db1f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,9 +44,9 @@
<activity
android:name=".HostListActivity"
- android:label="@string/title_hosts_list"
+ android:label="@string/app_name"
android:launchMode="singleTop">
- <intent-filter android:label="@string/app_name">
+ <intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index d844c50..3ad8c55 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -173,6 +173,7 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setContentView(R.layout.act_hostlist);
+ setTitle(R.string.title_hosts_list);
mListView = (RecyclerView) findViewById(R.id.list);
mListView.setHasFixedSize(true);