Merge branch 'vectorijk-development' into development

Graphics/android-icon-copier/README.md

@@ -73,6 +73,9 @@ Mapping vars:
 
 Options file
 ============
+
+*In this project, if you need to fetch new icons, rename options.templ.json to options.json. And then run script get-material-icons.sh*
+
 Named `options.json` in same dir. Sample:
 ```json
 {

Graphics/android-icon-copier/options.templ.json

@@ -1,5 +1,5 @@
 {
-    "basePath": "~/Documents",
+    "basePath": "../../",
     "filenameMap": {
         "classic": "ic_action_{name}{bgSuffix}.png",
         "fa": "ic_action_fa_{name}{bgSuffix}.png",

Graphics/get-material-icons.sh

@@ -11,6 +11,30 @@ python copy OpenKeychain av white repeat 24
 python copy OpenKeychain av grey repeat 24
 python copy OpenKeychain editor white mode_edit 24
 
+python copy OpenKeychain action grey delete 24
+python copy OpenKeychain action grey done 24
+python copy OpenKeychain action grey search 24
+python copy OpenKeychain action grey settings 24
+python copy OpenKeychain action grey view_list 24
+python copy OpenKeychain action grey lock 24
+python copy OpenKeychain action grey lock_open 24
+python copy OpenKeychain alert grey warning 24
+python copy OpenKeychain av grey play_arrow 24
+python copy OpenKeychain communication grey import_export 24
+python copy OpenKeychain content grey content_copy 24
+python copy OpenKeychain content grey content_paste 24
+python copy OpenKeychain content grey save 24
+python copy OpenKeychain content grey select_all 24
+python copy OpenKeychain editor grey mode_edit 24
+python copy OpenKeychain file grey cloud 24
+python copy OpenKeychain file grey folder 24
+python copy OpenKeychain file grey file_download 24
+python copy OpenKeychain file grey file_upload 24
+python copy OpenKeychain navigation grey close 24
+python copy OpenKeychain social grey person 24
+python copy OpenKeychain social grey person_add 24
+python copy OpenKeychain social grey share 24
+
 # navigation drawer sections
 python copy OpenKeychain communication black vpn_key 24
 python copy OpenKeychain action black lock 24
@@ -25,4 +49,4 @@ python copy OpenKeychain av white play_arrow 24
 python copy OpenKeychain file white folder 24
 
 # multi select
-python copy OpenKeychain action white lock 24
+python copy OpenKeychain action white lock 24

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java

@@ -176,7 +176,7 @@ public abstract class DecryptFragment extends Fragment {
 
                     setSignatureLayoutVisibility(View.VISIBLE);
                     mSignatureAction.setText(R.string.decrypt_result_action_Lookup);
-                    mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_download, 0);
+                    mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_file_download_grey_24dp, 0);
                     mSignatureLayout.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java

@@ -136,7 +136,7 @@ public class SelectPublicKeyFragment extends ListFragmentWorkaround implements T
         mSearchView.setId(SEARCH_ID);
         mSearchView.setHint(R.string.menu_search);
         mSearchView.setCompoundDrawablesWithIntrinsicBounds(
-                getResources().getDrawable(R.drawable.ic_action_search), null, null, null);
+                getResources().getDrawable(R.drawable.ic_search_grey_24dp), null, null, null);
 
         linearLayout.addView(mSearchView, new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));