NON-WORKING Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
	OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
	extern/spongycastle

1 files changed, 52 insertions, 11 deletions

diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index a21f949d1..c49e06b4b 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -1,8 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="emphasis">#aa66cc</color>
-    <color name="emphasis_dark">#9933cc</color>
+    <!-- Main theme colors -->
+
+    <!-- green colors from OpenKeychain logo bottom right -->
+    <!-- your app branding color for the app bar -->
+    <color name="primary">#7bad45</color>
+    <!-- darker variant for the status bar and contextual app bars -->
+    <color name="primary_dark">#6c983d</color>
+    <!-- theme UI controls like checkboxes and text fields -->
+    <color name="accent">#2196F3</color>
+
+    <!-- Other colors -->
+
+    <color name="primary_light">#C8E6C9</color>
+    <color name="fab">@color/accent</color>
+    <color name="fab_pressed">#1976D2</color>
+    <color name="primary_text">#212121</color>
+    <color name="secondary_text">#727272</color>
+    <color name="icons">#FFFFFF</color>
+    <color name="divider">#B6B6B6</color>
+
+    <color name="header_text">#212121</color>
+    <!-- item selection, search highlight -->
+    <color name="emphasis">@color/accent</color>
+
     <color name="bg_gray">#cecbce</color>
     <color name="tertiary_text_light">#808080</color>
     <color name="alert">#ffdd3333</color>
@@ -10,14 +32,33 @@
     <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>
+    <!-- tabs -->
+    <color name="tab_text">#70FFFFFF</color>
+    <color name="tab_text_selected">#FFFFFF</color>
+    <color name="tab_indicator">#FFFFFF</color>
+
+
+    <!-- floating action buttons -->
+    <color name="black_semi_transparent">#B2000000</color>
+    <color name="background">#e5e5e5</color>
+    <color name="half_black">#808080</color>
+    <color name="white">#fafafa</color>
+    <color name="white_pressed">#f1f1f1</color>
+
+    <!--
+        http://www.google.com/design/spec/style/color.html#color-color-palette
+        light = normal color
+        dark = 900
+
+        exception: green
+    -->
+    <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">@color/primary</color>
+    <color name="android_green_dark">@color/primary_dark</color>
+    <color name="android_purple_light">#673ab7</color>
+    <color name="android_purple_dark">#311b92</color>
 
 </resources>