From 5517b4f8cf471c29dd881baec58efd450f6cd5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 14 Jan 2015 02:03:20 +0100 Subject: Launcher icon fixes --- .../keychain/ui/PreferencesActivity.java | 6 +- .../keychain/ui/PreferencesKeyServerActivity.java | 9 +- .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 4563 -> 6885 bytes .../src/main/res/drawable-ldpi/ic_launcher.png | Bin 1966 -> 0 bytes .../src/main/res/drawable-ldpi/uid_mail_bad.png | Bin 531 -> 0 bytes .../src/main/res/drawable-ldpi/uid_mail_ok.png | Bin 646 -> 0 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 2867 -> 4641 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 6328 -> 8916 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 10207 -> 13548 bytes .../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 14135 -> 16742 bytes .../src/main/res/xml/preference_headers_legacy.xml | 12 -- Resources/graphics/ic_launcher.png | Bin 42069 -> 0 bytes Resources/graphics/ic_launcher.svg | 141 --------------------- Resources/graphics/update-drawables.sh | 19 ++- Resources/new icon/vector-src-inkscape-export.svg | 124 ------------------ 15 files changed, 16 insertions(+), 295 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png delete mode 100644 OpenKeychain/src/main/res/xml/preference_headers_legacy.xml delete mode 100644 Resources/graphics/ic_launcher.png delete mode 100644 Resources/graphics/ic_launcher.svg delete mode 100644 Resources/new icon/vector-src-inkscape-export.svg diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java index 51fac4779..1769caa47 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java @@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; @@ -33,8 +32,8 @@ import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.openpgp.PGPEncryptedData; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.ui.widget.IntegerListPreference; +import org.sufficientlysecure.keychain.util.Preferences; import java.util.List; @@ -130,9 +129,6 @@ public class PreferencesActivity extends PreferenceActivity { initializeUseNumKeypadForYubikeyPin( (CheckBoxPreference) findPreference(Constants.Pref.USE_NUMKEYPAD_FOR_YUBIKEY_PIN)); - } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { - // Load the legacy preferences headers - addPreferencesFromResource(R.xml.preference_headers_legacy); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java index 2a8ef171c..9e2e443af 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java @@ -35,7 +35,7 @@ import org.sufficientlysecure.keychain.ui.widget.KeyServerEditor; import java.util.Vector; -public class PreferencesKeyServerActivity extends ActionBarActivity implements OnClickListener, +public class PreferencesKeyServerActivity extends BaseActivity implements OnClickListener, EditorListener { public static final String EXTRA_KEY_SERVERS = "key_servers"; @@ -68,8 +68,6 @@ public class PreferencesKeyServerActivity extends ActionBarActivity implements O } ); - setContentView(R.layout.key_server_preference); - mInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); mTitle = (TextView) findViewById(R.id.title); @@ -102,6 +100,11 @@ public class PreferencesKeyServerActivity extends ActionBarActivity implements O makeServerList(servers); } + @Override + protected void initLayout() { + setContentView(R.layout.key_server_preference); + } + private void makeServerList(String[] servers) { if (servers != null) { mEditors.removeAllViews(); diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png index 6b2be4bc3..6133816d2 100644 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index c2b688424..000000000 Binary files a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png deleted file mode 100644 index 45467992f..000000000 Binary files a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png deleted file mode 100644 index c400a1820..000000000 Binary files a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png index 6bb29efde..d945a01de 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png index 6188bbed9..825b18b38 100644 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png index 765738881..4809acc39 100644 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png index d85507fef..fab324e93 100644 Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml deleted file mode 100644 index 47b0a0920..000000000 --- a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/Resources/graphics/ic_launcher.png b/Resources/graphics/ic_launcher.png deleted file mode 100644 index d6b0ea2c3..000000000 Binary files a/Resources/graphics/ic_launcher.png and /dev/null differ diff --git a/Resources/graphics/ic_launcher.svg b/Resources/graphics/ic_launcher.svg deleted file mode 100644 index 730b4b7d7..000000000 --- a/Resources/graphics/ic_launcher.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/Resources/graphics/update-drawables.sh b/Resources/graphics/update-drawables.sh index b8d2ffc88..f5c84a6bd 100755 --- a/Resources/graphics/update-drawables.sh +++ b/Resources/graphics/update-drawables.sh @@ -1,7 +1,6 @@ #!/bin/bash APP_DIR=../../OpenKeychain/src/main -LDPI_DIR=$APP_DIR/res/drawable-ldpi MDPI_DIR=$APP_DIR/res/drawable-mdpi HDPI_DIR=$APP_DIR/res/drawable-hdpi XDPI_DIR=$APP_DIR/res/drawable-xhdpi @@ -12,7 +11,6 @@ PLAY_DIR=./ # Launcher Icon: # ----------------------- -# ldpi: 36x36 # mdpi: 48x48 # hdpi: 72x72 # xhdpi: 96x96 @@ -20,15 +18,16 @@ PLAY_DIR=./ # xxxhdpi 192x192. # google play: 512x512 -NAME="ic_launcher" +# Adobe Illustrator (.ai) exports by Tha Phlash are way better than the Inkscape exports (.svg) -inkscape -w 36 -h 36 -e "$LDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 72 -h 72 -e "$HDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 144 -h 144 -e "$XXDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg +#NAME="ic_launcher" + +#inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 72 -h 72 -e "$HDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 144 -h 144 -e "$XXDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg +#inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg # Actionbar Icons # ----------------------- diff --git a/Resources/new icon/vector-src-inkscape-export.svg b/Resources/new icon/vector-src-inkscape-export.svg deleted file mode 100644 index e20d68d85..000000000 --- a/Resources/new icon/vector-src-inkscape-export.svg +++ /dev/null @@ -1,124 +0,0 @@ - - - -image/svg+xml \ No newline at end of file -- cgit v1.2.3