From: AndyScherzinger <info@andy-scherzinger.de>
Date: Sun, 26 Jul 2015 16:36:00 +0000 (+0200)
Subject: fine tuning icon work on login screen, making landscape visually en par with portrait... 
X-Git-Tag: oc-android-1.8~42^2~64
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e72caebbce437a6aa72d347d6530c7858a776f86?ds=inline;hp=--cc

fine tuning icon work on login screen, making landscape visually en par with portrait mode
---

e72caebbce437a6aa72d347d6530c7858a776f86
diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png
deleted file mode 100644
index fb146c33..00000000
Binary files a/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png
deleted file mode 100644
index 1fc3b4ec..00000000
Binary files a/res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png
deleted file mode 100644
index 6cae209f..00000000
Binary files a/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/common_error.png b/res/drawable-xxhdpi/common_error.png
new file mode 100644
index 00000000..3f401317
Binary files /dev/null and b/res/drawable-xxhdpi/common_error.png differ
diff --git a/res/drawable-xxhdpi/ic_action_refresh.png b/res/drawable-xxhdpi/ic_action_refresh.png
new file mode 100644
index 00000000..a5561e34
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_refresh.png differ
diff --git a/res/drawable-xxhdpi/ic_action_refresh_grey.png b/res/drawable-xxhdpi/ic_action_refresh_grey.png
new file mode 100644
index 00000000..5d8775aa
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_refresh_grey.png differ
diff --git a/res/drawable-xxhdpi/ic_lock.png b/res/drawable-xxhdpi/ic_lock.png
new file mode 100644
index 00000000..0dcada81
Binary files /dev/null and b/res/drawable-xxhdpi/ic_lock.png differ
diff --git a/res/drawable-xxhdpi/ic_lock_open.png b/res/drawable-xxhdpi/ic_lock_open.png
new file mode 100644
index 00000000..b90a5980
Binary files /dev/null and b/res/drawable-xxhdpi/ic_lock_open.png differ
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 27873a61..6b898740 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -76,6 +76,8 @@
 				    android:text="@string/auth_expired_basic_auth_toast" 
 				    android:visibility="gone"
 				    android:layout_marginBottom="10dp"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 			    <FrameLayout 
 	        		android:id="@+id/hostUrlFrame"
@@ -92,6 +94,8 @@
 						android:inputType="textUri"
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
+						android:textColor="#AAAAAA"
+						android:textColorHint="#AAAAAA"
 						android:contentDescription="@string/auth_host_address"
 						>
 						<requestFocus />
@@ -120,6 +124,8 @@
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dp"
 					android:gravity="center_vertical"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
 					android:text="@string/auth_testing_connection"
                     android:contentDescription="@string/auth_testing_connection"/>
 		             
@@ -130,6 +136,8 @@
 					android:checked="false"
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
 					/>
@@ -143,6 +151,8 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
 					android:visibility="gone">
 				</EditText>            
 				
@@ -155,6 +165,8 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
 					android:visibility="gone">
 					<requestFocus />
 				</EditText>            
@@ -166,6 +178,8 @@
 					android:ems="10"
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
 					android:contentDescription="@string/auth_username"
 					/>
 		
@@ -177,6 +191,8 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
 					android:contentDescription="@string/auth_password"
 					/>
 		        
@@ -188,6 +204,8 @@
 					android:text="@string/auth_unauthorized"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dip"
+					android:textColor="#AAAAAA"
+					android:textColorHint="#AAAAAA"
                     android:contentDescription="@string/auth_unauthorized"
 					/>
 
@@ -224,7 +242,7 @@
 		    android:paddingBottom="5dp"
 		    android:paddingTop="5dp"
 		    android:text="@string/auth_register"
-		    android:textColor="#0000FF"
+			android:textColor="#AAAAAA"
             android:contentDescription="@string/auth_register"/>
 	</LinearLayout>
 		
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index ceca6e04..4021ae2e 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -89,13 +89,13 @@
 			</EditText>
 			<ImageButton
 			    android:id="@+id/embeddedRefreshButton"
-			    android:layout_width="48dp"
-			    android:layout_height="48dp"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
 			    android:layout_gravity="center_vertical|right"
 			    android:layout_marginRight="5dp"
 			    android:padding="0dp"
 			    android:scaleType="fitCenter"
-			    android:src="@drawable/ic_action_refresh_black"
+			    android:src="@drawable/ic_action_refresh_grey"
             	android:onClick="onRefreshClick"
 				android:visibility="gone"
 				android:background="@android:color/transparent"
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e8f42d99..b7ec1c65 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -23,9 +23,6 @@
 
 package com.owncloud.android.authentication;
 
-import java.security.cert.X509Certificate;
-import java.util.Map;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Dialog;
@@ -93,6 +90,9 @@ import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
 import com.owncloud.android.utils.DisplayUtils;
 
+import java.security.cert.X509Certificate;
+import java.util.Map;
+
 /**
  * This Activity is used to add an ownCloud account to the App
  */
@@ -1146,7 +1146,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
         switch (result.getCode()) {
         case OK_SSL:
-            mServerStatusIcon = android.R.drawable.ic_secure;
+            mServerStatusIcon = R.drawable.ic_lock;
             mServerStatusText = R.string.auth_secure_connection;
             break;
 
@@ -1157,7 +1157,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mServerStatusIcon = R.drawable.ic_ok;
             } else {
                 mServerStatusText = R.string.auth_nossl_plain_ok_title;
-                mServerStatusIcon = android.R.drawable.ic_partial_secure;
+                mServerStatusIcon = R.drawable.ic_lock_open;
             }
             break;
 
@@ -1207,7 +1207,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mServerStatusText = R.string.auth_unknown_error_title;
             break;
         case OK_REDIRECT_TO_NON_SECURE_CONNECTION:
-            mServerStatusIcon = android.R.drawable.ic_partial_secure;
+            mServerStatusIcon = R.drawable.ic_lock_open;
             mServerStatusText = R.string.auth_redirect_non_secure_connection_title;
             break;
         default:
@@ -1227,7 +1227,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
         switch (result.getCode()) {
         case OK_SSL:
-            mAuthStatusIcon = android.R.drawable.ic_secure;
+            mAuthStatusIcon = R.drawable.ic_lock;
             mAuthStatusText = R.string.auth_secure_connection;
             break;
 
@@ -1238,7 +1238,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mAuthStatusIcon = R.drawable.ic_ok;
             } else {
                 mAuthStatusText = R.string.auth_nossl_plain_ok_title;
-                mAuthStatusIcon = android.R.drawable.ic_partial_secure;
+                mAuthStatusIcon = R.drawable.ic_lock_open;
             }
             break;