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

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 (file)
index fb146c3..0000000
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 (file)
index 1fc3b4e..0000000
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 (file)
index 6cae209..0000000
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 (file)
index 0000000..3f40131
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 (file)
index 0000000..a5561e3
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 (file)
index 0000000..5d8775a
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 (file)
index 0000000..0dcada8
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 (file)
index 0000000..b90a598
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 27873a6..6b89874 100644 (file)
--- 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" \r
                                    android:visibility="gone"\r
                                    android:layout_marginBottom="10dp"\r
                                    android:text="@string/auth_expired_basic_auth_toast" \r
                                    android:visibility="gone"\r
                                    android:layout_marginBottom="10dp"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r


@@ -92,6 +94,8 @@
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r

+                                               android:textColor="#AAAAAA"\r
+                                               android:textColorHint="#AAAAAA"\r

                                                android:contentDescription="@string/auth_host_address"\r
                                                >\r
                                                <requestFocus />\r
                                                android:contentDescription="@string/auth_host_address"\r
                                                >\r
                                                <requestFocus />\r


@@ -120,6 +124,8 @@
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dp"\r
                                        android:gravity="center_vertical"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dp"\r
                                        android:gravity="center_vertical"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                                        android:text="@string/auth_testing_connection"\r
                     android:contentDescription="@string/auth_testing_connection"/>\r
                             \r
                                        android:text="@string/auth_testing_connection"\r
                     android:contentDescription="@string/auth_testing_connection"/>\r
                             \r


@@ -130,6 +136,8 @@
                                        android:checked="false"\r
                                        android:onClick="onCheckClick"\r
                                        android:text="@string/oauth_check_onoff"\r
                                        android:checked="false"\r
                                        android:onClick="onCheckClick"\r
                                        android:text="@string/oauth_check_onoff"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                                        android:textAppearance="?android:attr/textAppearanceSmall"\r
                     android:contentDescription="@string/oauth_check_onoff"\r
                                        />\r
                                        android:textAppearance="?android:attr/textAppearanceSmall"\r
                     android:contentDescription="@string/oauth_check_onoff"\r
                                        />\r


@@ -143,6 +151,8 @@
                                        android:text="@string/oauth2_url_endpoint_auth"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
                                        android:text="@string/oauth2_url_endpoint_auth"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                                        android:visibility="gone">\r
                                </EditText>            \r
                                \r
                                        android:visibility="gone">\r
                                </EditText>            \r
                                \r


@@ -155,6 +165,8 @@
                                        android:text="@string/oauth2_url_endpoint_access"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
                                        android:text="@string/oauth2_url_endpoint_access"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                                        android:visibility="gone">\r
                                        <requestFocus />\r
                                </EditText>            \r
                                        android:visibility="gone">\r
                                        <requestFocus />\r
                                </EditText>            \r


@@ -166,6 +178,8 @@
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                                        android:contentDescription="@string/auth_username"\r
                                        />\r
                \r
                                        android:contentDescription="@string/auth_username"\r
                                        />\r
                \r


@@ -177,6 +191,8 @@
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                                        android:contentDescription="@string/auth_password"\r
                                        />\r
                        \r
                                        android:contentDescription="@string/auth_password"\r
                                        />\r
                        \r


@@ -188,6 +204,8 @@
                                        android:text="@string/auth_unauthorized"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dip"\r
                                        android:text="@string/auth_unauthorized"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dip"\r

+                                       android:textColor="#AAAAAA"\r
+                                       android:textColorHint="#AAAAAA"\r

                     android:contentDescription="@string/auth_unauthorized"\r
                                        />\r
 \r
                     android:contentDescription="@string/auth_unauthorized"\r
                                        />\r
 \r


@@ -224,7 +242,7 @@
                    android:paddingBottom="5dp"\r
                    android:paddingTop="5dp"\r
                    android:text="@string/auth_register"\r
                    android:paddingBottom="5dp"\r
                    android:paddingTop="5dp"\r
                    android:text="@string/auth_register"\r

-                   android:textColor="#0000FF"\r
+                       android:textColor="#AAAAAA"\r

             android:contentDescription="@string/auth_register"/>\r
        </LinearLayout>\r
                \r
             android:contentDescription="@string/auth_register"/>\r
        </LinearLayout>\r
                \r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index ceca6e0..4021ae2 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -89,13 +89,13 @@
                        </EditText>\r
                        <ImageButton\r
                            android:id="@+id/embeddedRefreshButton"\r
                        </EditText>\r
                        <ImageButton\r
                            android:id="@+id/embeddedRefreshButton"\r

-                           android:layout_width="48dp"\r
-                           android:layout_height="48dp"\r
+                           android:layout_width="wrap_content"\r
+                           android:layout_height="wrap_content"\r

                            android:layout_gravity="center_vertical|right"\r
                            android:layout_marginRight="5dp"\r
                            android:padding="0dp"\r
                            android:scaleType="fitCenter"\r
                            android:layout_gravity="center_vertical|right"\r
                            android:layout_marginRight="5dp"\r
                            android:padding="0dp"\r
                            android:scaleType="fitCenter"\r

-                           android:src="@drawable/ic_action_refresh_black"\r
+                           android:src="@drawable/ic_action_refresh_grey"\r

                android:onClick="onRefreshClick"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r
                android:onClick="onRefreshClick"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e8f42d9..b7ec1c6 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -23,9 +23,6 @@
 \r
 package com.owncloud.android.authentication;\r
 \r
 \r
 package com.owncloud.android.authentication;\r
 \r

-import java.security.cert.X509Certificate;\r
-import java.util.Map;\r
-\r

 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.Dialog;\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.Dialog;\r


@@ -93,6 +90,9 @@ import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 \r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 \r

+import java.security.cert.X509Certificate;\r
+import java.util.Map;\r
+\r

 /**\r
  * This Activity is used to add an ownCloud account to the App\r
  */\r
 /**\r
  * This Activity is used to add an ownCloud account to the App\r
  */\r


@@ -1146,7 +1146,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
         switch (result.getCode()) {\r
         case OK_SSL:\r
 \r
         switch (result.getCode()) {\r
         case OK_SSL:\r

-            mServerStatusIcon = android.R.drawable.ic_secure;\r
+            mServerStatusIcon = R.drawable.ic_lock;\r

             mServerStatusText = R.string.auth_secure_connection;\r
             break;\r
 \r
             mServerStatusText = R.string.auth_secure_connection;\r
             break;\r
 \r


@@ -1157,7 +1157,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mServerStatusIcon = R.drawable.ic_ok;\r
             } else {\r
                 mServerStatusText = R.string.auth_nossl_plain_ok_title;\r
                 mServerStatusIcon = R.drawable.ic_ok;\r
             } else {\r
                 mServerStatusText = R.string.auth_nossl_plain_ok_title;\r

-                mServerStatusIcon = android.R.drawable.ic_partial_secure;\r
+                mServerStatusIcon = R.drawable.ic_lock_open;\r

             }\r
             break;\r
 \r
             }\r
             break;\r
 \r


@@ -1207,7 +1207,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mServerStatusText = R.string.auth_unknown_error_title;\r
             break;\r
         case OK_REDIRECT_TO_NON_SECURE_CONNECTION:\r
             mServerStatusText = R.string.auth_unknown_error_title;\r
             break;\r
         case OK_REDIRECT_TO_NON_SECURE_CONNECTION:\r

-            mServerStatusIcon = android.R.drawable.ic_partial_secure;\r
+            mServerStatusIcon = R.drawable.ic_lock_open;\r

             mServerStatusText = R.string.auth_redirect_non_secure_connection_title;\r
             break;\r
         default:\r
             mServerStatusText = R.string.auth_redirect_non_secure_connection_title;\r
             break;\r
         default:\r


@@ -1227,7 +1227,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
         switch (result.getCode()) {\r
         case OK_SSL:\r
 \r
         switch (result.getCode()) {\r
         case OK_SSL:\r

-            mAuthStatusIcon = android.R.drawable.ic_secure;\r
+            mAuthStatusIcon = R.drawable.ic_lock;\r

             mAuthStatusText = R.string.auth_secure_connection;\r
             break;\r
 \r
             mAuthStatusText = R.string.auth_secure_connection;\r
             break;\r
 \r


@@ -1238,7 +1238,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mAuthStatusIcon = R.drawable.ic_ok;\r
             } else {\r
                 mAuthStatusText = R.string.auth_nossl_plain_ok_title;\r
                 mAuthStatusIcon = R.drawable.ic_ok;\r
             } else {\r
                 mAuthStatusText = R.string.auth_nossl_plain_ok_title;\r

-                mAuthStatusIcon = android.R.drawable.ic_partial_secure;\r
+                mAuthStatusIcon = R.drawable.ic_lock_open;\r

             }\r
             break;\r
 \r
             }\r
             break;\r
 \r