aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-02-20 11:04:07 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-02-20 11:04:07 +0100
commit9d7e05c06ea485725389768c83eade445f5ecbb5 (patch)
tree3ae4bcff79083beee89d6ce91855c34523cfc436
parenta468c667bbe91aadc63b9bf72649e068675d6179 (diff)
downloadopen-keychain-9d7e05c06ea485725389768c83eade445f5ecbb5.tar.gz
open-keychain-9d7e05c06ea485725389768c83eade445f5ecbb5.tar.bz2
open-keychain-9d7e05c06ea485725389768c83eade445f5ecbb5.zip
Screenshot for GSoC
-rw-r--r--Graphics/screenshots/device-2015-02-20-110239.pngbin0 -> 85007 bytes
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java2
-rw-r--r--OpenKeychain/src/main/res/menu/key_list.xml4
3 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/screenshots/device-2015-02-20-110239.png b/Graphics/screenshots/device-2015-02-20-110239.png
new file mode 100644
index 000000000..f20167e48
--- /dev/null
+++ b/Graphics/screenshots/device-2015-02-20-110239.png
Binary files differ
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
index d82e1c246..1bb8a9fb4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
@@ -39,7 +39,7 @@ public abstract class NavDrawerActivity extends MaterialNavigationDrawer {
setDrawerHeaderImage(R.drawable.drawer_header);
// create sections
- addSection(newSection(getString(R.string.title_keys), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment()));
+ addSection(newSection(getString(R.string.app_name), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment()));
addSection(newSection(getString(R.string.nav_encrypt_decrypt), R.drawable.ic_lock_black_24dp, new EncryptDecryptOverviewFragment()));
addSection(newSection(getString(R.string.title_api_registered_apps), R.drawable.ic_apps_black_24dp, new AppsListFragment()));
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 8a682badc..fef449463 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -13,12 +13,12 @@
android:id="@+id/menu_key_list_search_cloud"
android:icon="@drawable/ic_cloud_search_24px"
android:title="@string/menu_search_cloud"
- app:showAsAction="ifRoom|withText" />
+ app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_add"
android:title="@string/import_qr_code_button"
- app:showAsAction="ifRoom|withText" />
+ app:showAsAction="never" />
<item
android:id="@+id/menu_key_list_export"