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

1 files changed, 42 insertions, 11 deletions

diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index a21f949d1..353e33058 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -1,8 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="emphasis">#aa66cc</color>
-    <color name="emphasis_dark">#9933cc</color>
+    <!--<color name="colorPrimary">@color/material_deep_teal_500</color>-->
+    <!--<color name="colorPrimaryDark">@color/material_blue_grey_900</color>-->
+
+    <!-- TODO: -->
+
+    <color name="colorSecondary">@color/material_deep_teal_200</color>
+    <color name="colorSecondaryDark">@color/material_deep_teal_500</color>
+    <!--<color name="windowBackgroundColor">#333333</color>-->
+    <color name="black_translucent">#80000000</color>
+
+    <!-- Palette generated by Material Palette materialpalette.com/green/indigo -->
+    <color name="colorPrimary">#4CAF50</color>
+    <color name="colorPrimaryDark">#388E3C</color>
+
+    <!-- TODO: -->
+    <color name="primary">#4CAF50</color>
+    <color name="primary_dark">#388E3C</color>
+    <color name="primary_light">#C8E6C9</color>
+    <color name="accent">#536DFE</color>
+    <color name="primary_text">#212121</color>
+    <color name="secondary_text">#727272</color>
+    <color name="icons">#FFFFFF</color>
+    <color name="divider">#B6B6B6</color>
+
+
+    <!-- set to text colors -->
+    <color name="emphasis">#212121</color>
+    <color name="emphasis_dark">#727272</color>
+
     <color name="bg_gray">#cecbce</color>
     <color name="tertiary_text_light">#808080</color>
     <color name="alert">#ffdd3333</color>
@@ -10,14 +37,18 @@
     <color name="holo_gray_light">#33999999</color>
     <color name="holo_gray_bright">#33CCCCCC</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>
+    <!--
+        http://www.google.com/design/spec/style/color.html#color-color-palette
+        light = normal color
+        dark = 900
+    -->
+    <color name="android_red_light">#f44336</color>
+    <color name="android_red_dark">#b71c1c</color>
+    <color name="android_orange_light">#ff9800</color>
+    <color name="android_orange_dark">#e65100</color>
+    <color name="android_green_light">#4caf50</color>
+    <color name="android_green_dark">#1b5e20</color>
+    <color name="android_purple_light">#673ab7</color>
+    <color name="android_purple_dark">#311b92</color>
 
 </resources>