Merge branch 'master' into yubikey

Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java

1 files changed, 19 insertions, 0 deletions

diff --git a/Resources/graphics/update-drawables.sh b/Resources/graphics/update-drawables.sh
index c1dfc77e6..ae77d313a 100755
--- a/Resources/graphics/update-drawables.sh
+++ b/Resources/graphics/update-drawables.sh
@@ -39,8 +39,27 @@ inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
 
 for NAME in "ic_action_nfc" "ic_action_qr_code"
 do
+echo $NAME
 inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" $NAME.svg
 inkscape -w 48 -h 48 -e "$HDPI_DIR/$NAME.png" $NAME.svg
 inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" $NAME.svg
 inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" $NAME.svg
+done
+
+for NAME in status*.svg
+do
+echo $NAME
+inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME%%.*}.png" $NAME
+inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME%%.*}.png" $NAME
+inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME%%.*}.png" $NAME
+inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME%%.*}.png" $NAME
+done
+
+for NAME in "create_key_robot"
+do
+echo $NAME
+inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg
+inkscape -w 64 -h 64 -e "$HDPI_DIR/$NAME.png" $NAME.svg
+inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg
+inkscape -w 128 -h 128 -e "$XXDPI_DIR/$NAME.png" $NAME.svg
 done
\ No newline at end of file