diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:19:01 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:19:01 +0200 |
| commit | eae7c711a3f588a24ef621a8b82bcd793bcb7e70 (patch) | |
| tree | 6c1017380b9234a193cfc6c6460ebfd44923837d /OpenKeychain/src/main/res/values/colors.xml | |
| parent | 0c7eea225b7c04549e92c8c7729bf0e7a04aa5c7 (diff) | |
| parent | 50aea621ba4de844cf6eee077d1f5b14d0247f14 (diff) | |
| download | open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.tar.gz open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.tar.bz2 open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/values/colors.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index c0042d215..a21f949d1 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -5,12 +5,19 @@ <color name="emphasis_dark">#9933cc</color> <color name="bg_gray">#cecbce</color> <color name="tertiary_text_light">#808080</color> + <color name="alert">#ffdd3333</color> <color name="holo_gray_light">#33999999</color> <color name="holo_gray_bright">#33CCCCCC</color> - <color name="result_red">#ffff4444</color> - <color name="result_orange">#ffffbb33</color> - <color name="result_green">#ff99cc00</color> - <color name="result_purple">#aa66cc</color> + <!-- http://developer.android.com/design/style/color.html --> + <color name="android_red_light">#ffff4444</color> + <color name="android_red_dark">#ffCC0000</color> + <color name="android_orange_light">#ffffbb33</color> + <color name="android_orange_dark">#ffFF8800</color> + <color name="android_green_light">#ff99cc00</color> + <color name="android_green_dark">#ff669900</color> + <color name="android_purple_light">#ffaa66cc</color> + <color name="android_purple_dark">#ff9933CC</color> + </resources> |