Merge pull request #1177 from owncloud/notification_coloring

Add ownCloud color to notifications for lollipop

diff --git a/owncloud-android-library b/owncloud-android-library
index 5985ba9..ecc3415 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 5985ba9a9fd9a208b2a09ee7809949874e0c3a97
+Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 477011d..347568e 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -95,7 +95,6 @@
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
-                                               android:textColor="@color/primary"\r
                                                android:textColorHint="@color/login_text_hint_color"\r
                                                android:contentDescription="@string/auth_host_address"\r
                                                >\r
@@ -153,7 +152,6 @@
                                        android:text="@string/oauth2_url_endpoint_auth"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
-                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                </EditText>            \r
@@ -167,7 +165,6 @@
                                        android:text="@string/oauth2_url_endpoint_access"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
-                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                        <requestFocus />\r
@@ -180,7 +177,6 @@
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
-                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:contentDescription="@string/auth_username"\r
                                        />\r
@@ -193,7 +189,6 @@
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
-                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        />\r
                        \r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 876d834..3a8655f 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -82,7 +82,6 @@
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
-                android:textColor="@color/primary"\r
                 android:textColorHint="@color/login_text_hint_color"\r
                                android:contentDescription="@string/auth_host_address"\r
                 >\r
@@ -137,7 +136,6 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
                        android:enabled="false"\r
-            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
             android:singleLine="true"\r
@@ -154,7 +152,6 @@
             android:text="@string/oauth2_url_endpoint_access"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
-            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:visibility="gone"/>\r
 \r
@@ -165,7 +162,6 @@
             android:ems="10"\r
             android:hint="@string/auth_username"\r
             android:inputType="textNoSuggestions"\r
-            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_username"\r
             />\r
@@ -178,7 +174,6 @@
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
                    android:inputType="textPassword"\r
-            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
                    android:contentDescription="@string/auth_password"\r
             />\r

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8ca0a4e..dab9b3f 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,7 +19,7 @@
 -->
 <resources>
 
-    <color name="owncloud_blue">#1D2D44</color>
+    <color name="owncloud_blue">@color/actionbar_start_color</color>
     <color name="owncloud_blue_accent">#35537A</color>
     <color name="owncloud_blue_bright">#00ddff</color>
 

diff --git a/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java b/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
index c71b35f..5dd043f 100644 (file)
--- a/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
+++ b/src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
@@ -55,7 +55,8 @@ public class NotificationBuilderWithProgressBar extends NotificationCompat.Build
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
             return new NotificationBuilderWithProgressBar(context); 
         } else {
-            return new NotificationCompat.Builder(context);
+            return new NotificationCompat.Builder(context).
+                    setColor(context.getResources().getColor(R.color.primary));
         }
     }
     

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 43ddae3..7f8b0db 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -526,6 +526,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     private NotificationCompat.Builder createNotificationBuilder() {
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext());
         notificationBuilder.setSmallIcon(R.drawable.notification_icon).setAutoCancel(true);
+        notificationBuilder.setColor(getContext().getResources().getColor(R.color.primary));
         return notificationBuilder;
     }