From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 22 Oct 2015 11:03:53 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~24
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/426693b37d0c37c8d4de68ebb891108ac3a69603?ds=inline;hp=-c

Merge branch 'master' of https://github.com/owncloud/android into material_fab
---

426693b37d0c37c8d4de68ebb891108ac3a69603
diff --combined res/layout/account_setup.xml
index d5fd3234,3a8655fa..a555e2f0
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -82,7 -82,6 +82,6 @@@
  				android:inputType="textUri"
  				android:drawablePadding="5dp"
  				android:paddingRight="55dp"
-                 android:textColor="@color/primary"
                  android:textColorHint="@color/login_text_hint_color"
  				android:contentDescription="@string/auth_host_address"
                  >
@@@ -97,6 -96,7 +96,6 @@@
  			    android:padding="0dp"
  			    android:scaleType="fitCenter"
  			    android:src="@drawable/ic_action_refresh_grey"
 -            	android:onClick="onRefreshClick"
  				android:visibility="gone"
  				android:background="@android:color/transparent"
                  android:contentDescription="@string/auth_refresh_button"
@@@ -136,7 -136,6 +135,6 @@@
              android:layout_height="wrap_content"
              android:ems="10"
  			android:enabled="false"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
              android:text="@string/oauth2_url_endpoint_auth"
              android:singleLine="true"
@@@ -153,7 -152,6 +151,6 @@@
              android:text="@string/oauth2_url_endpoint_access"
              android:singleLine="true"
              android:inputType="textUri"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
              android:visibility="gone"/>
  
@@@ -164,7 -162,6 +161,6 @@@
              android:ems="10"
              android:hint="@string/auth_username"
              android:inputType="textNoSuggestions"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
              android:contentDescription="@string/auth_username"
              />
@@@ -177,7 -174,6 +173,6 @@@
  		    android:ems="10"
  		    android:hint="@string/auth_password"
  		    android:inputType="textPassword"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
  		    android:contentDescription="@string/auth_password"
              />
diff --combined res/values/colors.xml
index a22ca625,dab9b3fb..694e231b
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@@ -19,20 -19,16 +19,20 @@@
  -->
  <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>
  
 -    <color name="list_item_lastmod_and_filesize_text">#989898</color>
 +    <color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>
      <color name="black">#000000</color>
      <color name="white">#FFFFFF</color>
 -    <color name="textColor">#303030</color>
 +    <color name="fab_white">#fafafa</color>
 +    <color name="white_pressed">#f1f1f1</color>
 +    <color name="half_black">#808080</color>
 +    <color name="black_semi_transparent">#B2000000</color>
 +    <color name="textColor">@color/black</color>
      <color name="drawerMenuTextColor">#000000</color>
 -    <color name="list_divider_background">#fff0f0f0</color>
 +    <color name="list_divider_background">#eee</color>
      <color name="filelist_icon_backgorund">#DDDDDD</color>
      <color name="dark_background_text_color">#EEEEEE</color>
      <color name="login_text_color">#757575</color>
@@@ -40,9 -36,6 +40,9 @@@
      <color name="primary_button_color">@color/owncloud_blue_accent</color>
      <color name="secondary_button_color">#D6D7D7</color>
      <color name="transparent">#00000000</color>
 +    <color name="secondaryTextColor">#a0a0a0</color>
 +    <color name="listItemHighlighted">#f8f8f8</color>
 +    <color name="highlightTextColor">#55739a</color>
  
      <!-- Colors -->
      <color name="color_accent">@color/owncloud_blue_accent</color>