aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-05 11:19:19 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-05 11:19:19 +0200
commit4b6016fcfc7a70670db94b25c00266eb04283c96 (patch)
tree475ac35d169120f153c6230a1f264940939cbed0
parent12e44e7eeb278da697bbecd350634758a5d86fdd (diff)
downloadopen-keychain-4b6016fcfc7a70670db94b25c00266eb04283c96.tar.gz
open-keychain-4b6016fcfc7a70670db94b25c00266eb04283c96.tar.bz2
open-keychain-4b6016fcfc7a70670db94b25c00266eb04283c96.zip
Fix app name
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 058b0a447..959e1cf08 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -80,7 +80,7 @@
<activity
android:name=".ui.KeyListActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
- android:label="@string/nav_keys"
+ android:label="@string/app_name"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 4419a8a64..019ee82ec 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -49,6 +49,8 @@ public class KeyListActivity extends DrawerActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setTitle(R.string.nav_keys);
+
// if this is the first time show first time activity
Preferences prefs = Preferences.getPreferences(this);
if (prefs.isFirstTime()) {