aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-14 20:18:03 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-14 20:18:03 +0100
commit1516ebf26afdd10cab81da945251015af2aa819d (patch)
tree5ab9760114a46bf7545b155b7187d15d463174df /OpenKeychain/src/main/AndroidManifest.xml
parent85b6669625c9b94972fb03ec0de2da689c24d299 (diff)
downloadopen-keychain-1516ebf26afdd10cab81da945251015af2aa819d.tar.gz
open-keychain-1516ebf26afdd10cab81da945251015af2aa819d.tar.bz2
open-keychain-1516ebf26afdd10cab81da945251015af2aa819d.zip
Toolbar for settings
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index ab6c4334b..536b66319 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -418,7 +418,7 @@
android:label="@string/title_advanced_key_info">
</activity>
<activity
- android:name=".ui.PreferencesActivity"
+ android:name=".ui.SettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_preferences">
<intent-filter>
@@ -431,7 +431,7 @@
</intent-filter>
</activity>
<activity
- android:name=".ui.PreferencesKeyServerActivity"
+ android:name=".ui.SettingsKeyServerActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_key_server_preference"
android:windowSoftInputMode="stateHidden" />