From: masensio Date: Fri, 20 Mar 2015 13:55:48 +0000 (+0100) Subject: Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop X-Git-Tag: oc-android-1.7.1_signed^2~9^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c0da8a93f24f4f87256e71c32f3c2a300d22e62f?hp=879160bebed4f1def5a1d1719b29251393192dfe Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop --- diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml index 61ca2dd2..fa357c23 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -38,7 +38,8 @@ android:layout_weight="1" android:layout_gravity="center" android:background="@color/login_logo_background_color" - android:src="@drawable/logo" + android:src="@drawable/logo" + android:contentDescription="@string/app_name" /> + android:visibility="gone" + android:contentDescription="@string/auth_check_server"/> + android:layout_marginBottom="10dp" + android:contentDescription="@string/auth_expired_basic_auth_toast"/> @@ -104,6 +108,7 @@ android:onClick="onRefreshClick" android:visibility="gone" android:background="@android:color/transparent" + android:contentDescription="@string/auth_refresh_button" /> @@ -115,7 +120,8 @@ android:drawableLeft="@android:drawable/stat_notify_sync" android:drawablePadding="5dp" android:gravity="center_vertical" - android:text="@string/auth_testing_connection" /> + android:text="@string/auth_testing_connection" + android:contentDescription="@string/auth_testing_connection"/> + android:visibility="gone"> + android:visibility="gone"> @@ -158,7 +165,8 @@ android:layout_height="wrap_content" android:ems="10" android:hint="@string/auth_username" - android:inputType="textNoSuggestions" /> + android:inputType="textNoSuggestions" + android:contentDescription="@string/auth_username"/> @@ -200,7 +210,8 @@ android:layout_gravity="center_horizontal" android:enabled="false" android:onClick="onOkClick" - android:text="@string/setup_btn_connect" /> + android:text="@string/setup_btn_connect" + android:contentDescription="@string/setup_btn_connect"/>