aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/colors.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-04-26 01:02:22 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-04-26 01:02:22 +0200
commit1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc (patch)
treeadd2f0d85813f9ece1be3c926b4ae8f221d7cf47 /OpenKeychain/src/main/res/values/colors.xml
parentd6d678dae3ed5d794a9aa5e289197d264f6a7ff9 (diff)
parentc442d3bd0d3bac96614d3d5c0e833a42cab4706e (diff)
downloadopen-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.gz
open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.bz2
open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.zip
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values/colors.xml')
-rw-r--r--OpenKeychain/src/main/res/values/colors.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 8c5358fd0..ead006a63 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -22,6 +22,7 @@
<color name="secondary_text">#727272</color>
<color name="icons">#FFFFFF</color>
<color name="divider">#B6B6B6</color>
+ <color name="transparent">#00FFFFFF</color>
<color name="header_text">#212121</color>
<!-- item selection, search highlight -->