diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
commit | e10cbc54c606563b2d06f083bca17119ca585127 (patch) | |
tree | 23c71e67b1c4a381997bdb75de476f05d7dcec5f /OpenKeychain/src/main/res/values/colors.xml | |
parent | bef3e621118d0e4d8fadedf0c9d67b6a9ff41883 (diff) | |
parent | acbf2a18617eea73924dd109e09189420d9876fe (diff) | |
download | open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.gz open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.bz2 open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.zip |
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
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> |