diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
| commit | 34a7728cec5c17ef25f3d5cd56421e4f5258862d (patch) | |
| tree | f8fcf0aced9b106facff2e50405a19288931da6b /Resources/graphics/icon_sizes.txt | |
| parent | b73ad7d87e7ddef03c17b4983f526c0613403df6 (diff) | |
| parent | e049895b9f8f5f9996ac678acf6810768e859695 (diff) | |
| download | open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.gz open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.bz2 open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.zip | |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'Resources/graphics/icon_sizes.txt')
| -rw-r--r-- | Resources/graphics/icon_sizes.txt | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/Resources/graphics/icon_sizes.txt b/Resources/graphics/icon_sizes.txt deleted file mode 100644 index 2e960f6fd..000000000 --- a/Resources/graphics/icon_sizes.txt +++ /dev/null @@ -1,30 +0,0 @@ -Launcher Icon: ------------------------ -ldpi: 36x36 -mdpi: 48x48 -hdpi: 72x72 -xhdpi: 96x96 -google code: 55x55 -android market: 512x512 - -Status Bar Icon: ------------------------ -Android < 3.0 -ldpi: 12x19 -mdpi: 16x25 -hdpi: 24x38 - -Android > 3.0 -ldpi: 18x18 -mdpi: 24x24 -hdpi: 36x36 -xhdpi: 48x48 - -ActionBar Icon: ------------------------ -ldpi: none -mdpi: 36 x 36 px -hdpi: 48 x 48 px -xhdpi: 64 x 64 px - -color: #737373
\ No newline at end of file |