Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development

2015-03-03 23:46:20 +01:00
parent c00a1f1ec3 57dca38374
commit 1cc860d23f
249 changed files with 71 additions and 44 deletions
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -73,7 +73,7 @@
                android:layout_height="match_parent"
                android:text="@string/import_import"
                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_download"
+                android:drawableRight="@drawable/ic_file_download_grey_24dp"
                android:drawablePadding="8dp"
                android:gravity="center_vertical"
                android:clickable="true"