--<?xml version="1.0" encoding="utf-8"?>
--<!--
- ownCloud Android client application
-
- Copyright (C) 2012 Bartek Przybylski
- Copyright (C) 2012-2013 ownCloud Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2,
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:focusable="true"
- android:gravity="center|fill"
- android:orientation="vertical" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_weight="1" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <ImageView
- android:id="@+id/imageView1"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_margin="7dp"
- android:layout_weight="1"
- android:src="@drawable/owncloud_logo" />
-
- <LinearLayout
- android:id="@+id/LinearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="1"
- android:orientation="vertical" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/host_URL"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ems="10"
- android:hint="@string/auth_host_url"
- android:inputType="textNoSuggestions">
- <requestFocus />
- </EditText>
-
- <ImageView
- android:id="@+id/refreshButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_action_refresh_black"
- android:visibility="invisible" />
- </FrameLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_weight="1" >
-
- <ImageView
- android:id="@+id/action_indicator"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:src="@android:drawable/stat_notify_sync"
- android:visibility="invisible" />
-
- <TextView
- android:id="@+id/status_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="TextView"
- android:visibility="invisible" />
- </LinearLayout>
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:text="@string/auth_login_details"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <EditText
- android:id="@+id/account_username"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:ems="10"
- android:hint="@string/auth_username"
- android:inputType="textNoSuggestions" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/account_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ems="10"
- android:hint="@string/auth_password"
- android:inputType="textPassword"/>
-
- <ImageView
- android:id="@+id/viewPassword"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:src="@android:drawable/ic_menu_view"
- android:visibility="invisible" />
- </FrameLayout>
- </LinearLayout>
- </LinearLayout>
- </FrameLayout>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true" >
-
- <LinearLayout
- android:id="@+id/buttons_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:weightSum="1">
-
- <Button
- android:id="@+id/buttonOK"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight=".5"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:enabled="false"
- android:onClick="onOkClick"
- android:text="@string/setup_btn_connect"
- android:textColor="@android:color/black" />
-
- </LinearLayout>
-
- <Button
- android:id="@+id/account_register"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/buttons_layout"
- android:layout_centerHorizontal="true"
- android:onClick="onRegisterClick"
- android:paddingTop="10dp"
- android:paddingBottom="10dp"
- android:textColor="#0000FF"
- android:background="@android:color/transparent" />
- <!-- android:text="@string/app_name @string/auth_register" /-->
-
- </RelativeLayout>
-
-</LinearLayout>
++<?xml version="1.0" encoding="utf-8"?>\r
++<!--\r
+ ownCloud Android client application\r
+\r
- Copyright (C) 2012 Bartek Przybylski
- Copyright (C) 2012-2013 ownCloud Inc.
++ Copyright (C) 2012 Bartek Przybylski\r
++ Copyright (C) 2012-2013 ownCloud Inc.\r
+\r
+ This program is free software: you can redistribute it and/or modify\r
- it under the terms of the GNU General Public License version 2,
++ it under the terms of the GNU General Public License version 2,\r
+ as published by the Free Software Foundation.\r
+\r
+ This program is distributed in the hope that it will be useful,\r
+ but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ GNU General Public License for more details.\r
+\r
+ You should have received a copy of the GNU General Public License\r
+ along with this program. If not, see <http://www.gnu.org/licenses/>.\r
- -->
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:focusable="true"
- android:gravity="center|fill"
- android:orientation="vertical" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_weight="1" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <ImageView
- android:id="@+id/imageView1"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_margin="7dp"
- android:layout_weight="1"
- android:src="@drawable/owncloud_logo" />
-
- <LinearLayout
- android:id="@+id/LinearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="1"
- android:orientation="vertical" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/hostUrlInput"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/auth_host_url"
- android:inputType="textNoSuggestions">
- <requestFocus />
- </EditText>
-
- <ImageView
- android:id="@+id/refreshButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:src="@drawable/ic_action_refresh_black"
- android:onClick="onRefreshClick"
- android:visibility="invisible" />
- </FrameLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_weight="1" >
-
- <ImageView
- android:id="@+id/action_indicator"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:src="@android:drawable/stat_notify_sync"
- android:visibility="invisible" />
-
- <TextView
- android:id="@+id/status_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="TextView"
- android:visibility="invisible" />
- </LinearLayout>
-
- <CheckBox
- android:id="@+id/oauth_onOff_check"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:checked="false"
- android:onClick="onCheckClick"
- android:text="@string/oauth_check_onoff"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:text="@string/auth_login_details"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <EditText
- android:id="@+id/oAuthEntryPoint_1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ems="10"
- android:enabled="false"
- android:text="@string/oauth2_url_endpoint_auth"
- android:singleLine="true"
- android:visibility="gone" >
-
- <requestFocus />
- </EditText>
-
- <EditText
- android:id="@+id/oAuthEntryPoint_2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ems="10"
- android:enabled="false"
- android:text="@string/oauth2_url_endpoint_access"
- android:singleLine="true"
- android:visibility="gone" >
-
- <requestFocus />
- </EditText>
-
- <EditText
- android:id="@+id/account_username"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:ems="10"
- android:hint="@string/auth_username"
- android:inputType="textNoSuggestions" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/account_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/auth_password"
- android:inputType="textPassword"/>
-
- <ImageView
- android:id="@+id/viewPasswordButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:src="@android:drawable/ic_menu_view"
- android:onClick="onViewPasswordClick"
- android:visibility="invisible" />
- </FrameLayout>
- </LinearLayout>
-
- <!-- LinearLayout
- android:id="@+id/auth_status_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:visibility="invisible"
- >
-
- <ImageView
- android:id="@+id/auth_status_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:src="@android:drawable/stat_notify_sync"
- />
-
- <TextView
- android:id="@+id/auth_status_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/text_placeholder"
- />
-
- </LinearLayout -->
-
- <TextView
- android:id="@+id/auth_status_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/text_placeholder"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:drawableLeft="@android:drawable/stat_notify_sync"
- android:drawablePadding="5dip"
- android:visibility="invisible"
- />
-
-
- </LinearLayout>
- </FrameLayout>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true" >
-
- <LinearLayout
- android:id="@+id/buttons_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:weightSum="1">
-
- <Button
- android:id="@+id/buttonCancel"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight=".5"
- android:onClick="onCancelClick"
- android:text="@string/common_cancel" />
-
- <Button
- android:id="@+id/buttonOK"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight=".5"
- android:enabled="false"
- android:onClick="onOkClick"
- android:text="@string/setup_btn_connect"
- android:textColor="@android:color/black" />
-
- </LinearLayout>
-
- <Button
- android:id="@+id/account_register"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/buttons_layout"
- android:layout_centerHorizontal="true"
- android:onClick="onRegisterClick"
- android:paddingTop="10dp"
- android:paddingBottom="10dp"
- android:textColor="#0000FF"
- android:background="@android:color/transparent" />
- <!-- android:text="@string/app_name @string/auth_register" /-->
-
- </RelativeLayout>
-
- </LinearLayout>
++-->\r
++<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
++ xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"\r
++ android:layout_width="fill_parent"\r
++ android:layout_height="fill_parent"\r
++ android:focusable="true"\r
++ android:gravity="center|fill"\r
++ android:orientation="vertical" >\r
++\r
++ <FrameLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_gravity="center"\r
++ android:layout_marginLeft="16dip"\r
++ android:layout_marginRight="16dip"\r
++ android:layout_weight="1" >\r
++\r
++ <LinearLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="match_parent" >\r
++\r
++ <ImageView\r
++ android:id="@+id/imageView1"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="match_parent"\r
++ android:layout_margin="7dp"\r
++ android:layout_weight="1"\r
++ android:src="@drawable/owncloud_logo" />\r
++\r
++ <LinearLayout\r
++ android:id="@+id/LinearLayout1"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_gravity="center"\r
++ android:layout_weight="1"\r
++ android:orientation="vertical" >\r
++\r
++ <FrameLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1" >\r
++\r
++ <EditText\r
++ android:id="@+id/hostUrlInput"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:ems="10"\r
++ android:hint="@string/auth_host_url"\r
++ android:inputType="textNoSuggestions">\r
++ <requestFocus />\r
++ </EditText>\r
++\r
++ <ImageView\r
++ android:id="@+id/refreshButton"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_gravity="right|center_vertical"\r
++ android:src="@drawable/ic_action_refresh_black"\r
++ android:onClick="onRefreshClick"\r
++ android:visibility="invisible" />\r
++ </FrameLayout>\r
++\r
++ <LinearLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="50dp"\r
++ android:layout_weight="1" >\r
++\r
++ <ImageView\r
++ android:id="@+id/action_indicator"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_marginLeft="5dp"\r
++ android:layout_marginRight="5dp"\r
++ android:src="@android:drawable/stat_notify_sync"\r
++ android:visibility="invisible" />\r
++\r
++ <TextView\r
++ android:id="@+id/status_text"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:text="TextView"\r
++ android:visibility="invisible" />\r
++ </LinearLayout>\r
++\r
++ <CheckBox\r
++ android:id="@+id/oauth_onOff_check"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:checked="false"\r
++ android:onClick="onCheckClick"\r
++ android:text="@string/oauth_check_onoff"\r
++ android:textAppearance="?android:attr/textAppearanceSmall" />\r
++\r
++ <TextView\r
++ android:id="@+id/textView2"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="0dp"\r
++ android:layout_weight="1"\r
++ android:text="@string/auth_login_details"\r
++ android:textAppearance="?android:attr/textAppearanceSmall" />\r
++\r
++ <EditText\r
++ android:id="@+id/oAuthEntryPoint_1"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1"\r
++ android:ems="10"\r
++ android:enabled="false"\r
++ android:text="@string/oauth2_url_endpoint_auth"\r
++ android:singleLine="true"\r
++ android:visibility="gone" >\r
++ \r
++ <requestFocus />\r
++ </EditText> \r
++ \r
++ <EditText\r
++ android:id="@+id/oAuthEntryPoint_2"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1"\r
++ android:ems="10"\r
++ android:enabled="false"\r
++ android:text="@string/oauth2_url_endpoint_access"\r
++ android:singleLine="true"\r
++ android:visibility="gone" >\r
++ \r
++ <requestFocus />\r
++ </EditText> \r
++ \r
++ <EditText\r
++ android:id="@+id/account_username"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="0dp"\r
++ android:layout_weight="1"\r
++ android:ems="10"\r
++ android:hint="@string/auth_username"\r
++ android:inputType="textNoSuggestions" />\r
++\r
++ <FrameLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1" >\r
++\r
++ <EditText\r
++ android:id="@+id/account_password"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:ems="10"\r
++ android:hint="@string/auth_password"\r
++ android:inputType="textPassword"/>\r
++\r
++ <ImageView\r
++ android:id="@+id/viewPasswordButton"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_gravity="right|center_vertical"\r
++ android:src="@android:drawable/ic_menu_view"\r
++ android:onClick="onViewPasswordClick"\r
++ android:visibility="invisible" />\r
++ </FrameLayout>\r
++ \r
++ <TextView\r
++ android:id="@+id/auth_status_text"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1" \r
++ android:text="@string/text_placeholder"\r
++ android:layout_marginLeft="5dp"\r
++ android:layout_marginRight="5dp"\r
++ android:drawableLeft="@android:drawable/stat_notify_sync"\r
++ android:drawablePadding="5dip"\r
++ android:visibility="invisible" \r
++ />\r
++ \r
++ </LinearLayout>\r
++ \r
++ </LinearLayout>\r
++ </FrameLayout>\r
++\r
++ <RelativeLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_alignParentBottom="true" >\r
++\r
++ <LinearLayout\r
++ android:id="@+id/buttons_layout" \r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:weightSum="1">\r
++\r
++ <Button\r
++ android:id="@+id/buttonOK"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight=".5"\r
++ android:layout_marginLeft="16dip"\r
++ android:layout_marginRight="16dip"\r
++ android:enabled="false"\r
++ android:onClick="onOkClick"\r
++ android:text="@string/setup_btn_connect"\r
++ android:textColor="@android:color/black" />\r
++ \r
++ </LinearLayout>\r
++ \r
++ <Button\r
++ android:id="@+id/account_register"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_below="@id/buttons_layout"\r
++ android:layout_centerHorizontal="true"\r
++ android:onClick="onRegisterClick"\r
++ android:paddingTop="10dp"\r
++ android:paddingBottom="10dp"\r
++ android:textColor="#0000FF"\r
++ android:background="@android:color/transparent" />\r
++ <!-- android:text="@string/app_name @string/auth_register" /-->\r
++ \r
++ </RelativeLayout>\r
++\r
++</LinearLayout>\r
--<?xml version="1.0" encoding="utf-8"?>
--<!--
- ownCloud Android client application
-
- Copyright (C) 2012 Bartek Przybylski
- Copyright (C) 2012-2013 ownCloud Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2,
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:focusable="true"
- android:gravity="center"
- android:orientation="vertical" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_gravity="center"
- android:layout_marginBottom="50dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_weight="1" >
-
- <LinearLayout
- android:id="@+id/LinearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/imageView1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
- android:layout_weight="1"
- android:src="@drawable/owncloud_logo" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/host_URL"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/auth_host_url"
- android:inputType="textNoSuggestions" >
- <requestFocus />
- </EditText>
-
- <ImageView
- android:id="@+id/refreshButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_action_refresh_black"
- android:layout_gravity="right|center_vertical"
- android:visibility="invisible" />
-
- </FrameLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_weight="1" >
-
- <ImageView
- android:id="@+id/action_indicator"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:src="@android:drawable/stat_notify_sync"
- android:visibility="invisible" />
-
- <TextView
- android:id="@+id/status_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="TextView"
- android:visibility="invisible" />
-
- </LinearLayout>
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:text="@string/auth_login_details"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <EditText
- android:id="@+id/account_username"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:ems="10"
- android:hint="@string/auth_username"
- android:inputType="textNoSuggestions" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/account_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/auth_password"
- android:inputType="textPassword"/>
-
- <ImageView
- android:id="@+id/viewPassword"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:src="@android:drawable/ic_menu_view"
- android:visibility="invisible" />
-
- </FrameLayout>
-
- </LinearLayout>
-
- </FrameLayout>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <LinearLayout
- android:id="@+id/buttons_layout"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:weightSum="1">
-
- <Button
- android:id="@+id/buttonOK"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:enabled="false"
- android:onClick="onOkClick"
- android:text="@string/setup_btn_connect"
- android:textColor="@android:color/black" />
-
- </LinearLayout>
-
- <Button
- android:id="@+id/account_register"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/buttons_layout"
- android:layout_centerHorizontal="true"
- android:onClick="onRegisterClick"
- android:paddingTop="10dp"
- android:paddingBottom="10dp"
- android:textColor="#0000FF"
- android:background="@android:color/transparent" />
-
- </RelativeLayout>
-
- </LinearLayout>
-
-</ScrollView>
++<?xml version="1.0" encoding="utf-8"?>\r
++<!--\r
+ ownCloud Android client application\r
+\r
- Copyright (C) 2012 Bartek Przybylski
- Copyright (C) 2012-2013 ownCloud Inc.
++ Copyright (C) 2012 Bartek Przybylski\r
++ Copyright (C) 2012-2013 ownCloud Inc.\r
+\r
+ This program is free software: you can redistribute it and/or modify\r
- it under the terms of the GNU General Public License version 2,
++ it under the terms of the GNU General Public License version 2,\r
+ as published by the Free Software Foundation.\r
+\r
+ This program is distributed in the hope that it will be useful,\r
+ but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ GNU General Public License for more details.\r
+\r
+ You should have received a copy of the GNU General Public License\r
+ along with this program. If not, see <http://www.gnu.org/licenses/>.\r
- -->
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:focusable="true"
- android:gravity="center|fill"
- android:orientation="vertical" >
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_weight="1" >
-
- <LinearLayout
- android:id="@+id/LinearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/imageView1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
- android:layout_weight="1"
- android:src="@drawable/owncloud_logo" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/hostUrlInput"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/auth_host_url"
- android:inputType="textNoSuggestions" >
- <requestFocus />
- </EditText>
-
- <ImageView
- android:id="@+id/refreshButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_action_refresh_black"
- android:onClick="onRefreshClick"
- android:layout_gravity="right|center_vertical"
- android:visibility="invisible" />
-
- </FrameLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_weight="1" >
-
- <ImageView
- android:id="@+id/action_indicator"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:src="@android:drawable/stat_notify_sync"
- android:visibility="invisible" />
-
- <TextView
- android:id="@+id/status_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="TextView"
- android:visibility="invisible" />
- </LinearLayout>
-
- <CheckBox
- android:id="@+id/oauth_onOff_check"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:checked="false"
- android:onClick="onCheckClick"
- android:text="@string/oauth_check_onoff"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:text="@string/auth_login_details"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <EditText
- android:id="@+id/oAuthEntryPoint_1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ems="10"
- android:text="@string/oauth2_url_endpoint_auth"
- android:singleLine="true"
- android:visibility="gone" >
-
- <requestFocus />
- </EditText>
-
- <EditText
- android:id="@+id/oAuthEntryPoint_2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ems="10"
- android:text="@string/oauth2_url_endpoint_access"
- android:singleLine="true"
- android:visibility="gone" >
-
- <requestFocus />
- </EditText>
-
- <EditText
- android:id="@+id/account_username"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:ems="10"
- android:hint="@string/auth_username"
- android:inputType="textNoSuggestions" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <EditText
- android:id="@+id/account_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="@string/auth_password"
- android:inputType="textPassword"/>
-
- <ImageView
- android:id="@+id/viewPasswordButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:src="@android:drawable/ic_menu_view"
- android:onClick="onViewPasswordClick"
- android:visibility="invisible" />
-
- </FrameLayout>
-
- <!-- LinearLayout
- android:id="@+id/auth_status_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:visibility="invisible"
- >
-
- <ImageView
- android:id="@+id/auth_status_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:src="@android:drawable/stat_notify_sync"
- />
-
- <TextView
- android:id="@+id/auth_status_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/text_placeholder"
- >
-
- </LinearLayout -->
-
- <TextView
- android:id="@+id/auth_status_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/text_placeholder"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:drawableLeft="@android:drawable/stat_notify_sync"
- android:drawablePadding="5dip"
- android:visibility="invisible"
- />
-
- </LinearLayout>
-
- </FrameLayout>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <LinearLayout
- android:id="@+id/buttons_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:weightSum="1" >
-
- <Button
- android:id="@+id/buttonCancel"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight=".5"
- android:onClick="onCancelClick"
- android:text="@string/common_cancel" />
-
- <Button
- android:id="@+id/buttonOK"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight=".5"
- android:enabled="false"
- android:onClick="onOkClick"
- android:text="@string/setup_btn_connect"
- android:textColor="@android:color/black" />
-
- </LinearLayout>
-
- <Button
- android:id="@+id/account_register"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/buttons_layout"
- android:layout_centerHorizontal="true"
- android:onClick="onRegisterClick"
- android:paddingTop="10dp"
- android:paddingBottom="10dp"
- android:textColor="#0000FF"
- android:background="@android:color/transparent" />
- <!-- android:text="@string/app_name @string/auth_register" /-->
-
- </RelativeLayout>
-
- </LinearLayout>
++-->\r
++<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"\r
++ android:layout_width="fill_parent"\r
++ android:layout_height="fill_parent"\r
++ android:focusable="true"\r
++ android:gravity="center|fill"\r
++ android:orientation="vertical" >\r
++\r
++ <FrameLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="0dip"\r
++ android:layout_gravity="center"\r
++ android:layout_marginBottom="50dip"\r
++ android:layout_marginLeft="16dip"\r
++ android:layout_marginRight="16dip"\r
++ android:layout_weight="1" >\r
++ \r
++ <LinearLayout\r
++ android:id="@+id/LinearLayout1"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_gravity="center"\r
++ android:orientation="vertical" >\r
++ \r
++ <ImageView\r
++ android:id="@+id/imageView1"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_marginBottom="10dp"\r
++ android:layout_weight="1"\r
++ android:src="@drawable/owncloud_logo" />\r
++ \r
++ <FrameLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1" >\r
++\r
++ <EditText\r
++ android:id="@+id/hostUrlInput"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:ems="10"\r
++ android:hint="@string/auth_host_url"\r
++ android:inputType="textNoSuggestions" >\r
++ <requestFocus />\r
++ </EditText>\r
++\r
++ <ImageView\r
++ android:id="@+id/refreshButton"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:src="@drawable/ic_action_refresh_black"\r
++ android:layout_gravity="right|center_vertical"\r
++ android:visibility="invisible" />\r
++\r
++ </FrameLayout>\r
++\r
++ <LinearLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="50dp"\r
++ android:layout_weight="1" >\r
++\r
++ <ImageView\r
++ android:id="@+id/action_indicator"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_marginLeft="5dp"\r
++ android:layout_marginRight="5dp"\r
++ android:src="@android:drawable/stat_notify_sync"\r
++ android:visibility="invisible" />\r
++\r
++ <TextView\r
++ android:id="@+id/status_text"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:text="TextView"\r
++ android:visibility="invisible" />\r
++\r
++ </LinearLayout>\r
++\r
++ <CheckBox\r
++ android:id="@+id/oauth_onOff_check"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:checked="false"\r
++ android:onClick="onCheckClick"\r
++ android:text="@string/oauth_check_onoff"\r
++ android:textAppearance="?android:attr/textAppearanceSmall" />\r
++\r
++ <TextView\r
++ android:id="@+id/textView2"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="0dp"\r
++ android:layout_weight="1"\r
++ android:text="@string/auth_login_details"\r
++ android:textAppearance="?android:attr/textAppearanceSmall" />\r
++\r
++ <EditText\r
++ android:id="@+id/oAuthEntryPoint_1"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1"\r
++ android:ems="10"\r
++ android:text="@string/oauth2_url_endpoint_auth"\r
++ android:singleLine="true"\r
++ android:visibility="gone" >\r
++\r
++ <requestFocus />\r
++ </EditText> \r
++\r
++ <EditText\r
++ android:id="@+id/oAuthEntryPoint_2"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1"\r
++ android:ems="10"\r
++ android:text="@string/oauth2_url_endpoint_access"\r
++ android:singleLine="true"\r
++ android:visibility="gone" >\r
++\r
++ <requestFocus />\r
++ </EditText> \r
++\r
++ <EditText\r
++ android:id="@+id/account_username"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="0dp"\r
++ android:layout_weight="1"\r
++ android:ems="10"\r
++ android:hint="@string/auth_username"\r
++ android:inputType="textNoSuggestions" />\r
++\r
++ <FrameLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1" >\r
++\r
++ <EditText\r
++ android:id="@+id/account_password"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:ems="10"\r
++ android:hint="@string/auth_password"\r
++ android:inputType="textPassword"/>\r
++\r
++ <ImageView\r
++ android:id="@+id/viewPassword"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_gravity="right|center_vertical"\r
++ android:src="@android:drawable/ic_menu_view"\r
++ android:onClick="onViewPasswordClick"\r
++ android:visibility="invisible" />\r
++\r
++ </FrameLayout>\r
++ \r
++ <TextView\r
++ android:id="@+id/auth_status_text"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_weight="1" \r
++ android:text="@string/text_placeholder"\r
++ android:layout_marginLeft="5dp"\r
++ android:layout_marginRight="5dp"\r
++ android:drawableLeft="@android:drawable/stat_notify_sync"\r
++ android:drawablePadding="5dip"\r
++ android:visibility="invisible" \r
++ />\r
++ \r
++ </LinearLayout>\r
++\r
++ </FrameLayout>\r
++\r
++ <RelativeLayout\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content">\r
++\r
++ <LinearLayout\r
++ android:id="@+id/buttons_layout"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:weightSum="1">\r
++\r
++ <Button\r
++ android:id="@+id/buttonOK"\r
++ android:layout_width="match_parent"\r
++ android:layout_height="wrap_content"\r
++ android:layout_gravity="center_horizontal"\r
++ android:layout_marginLeft="16dip"\r
++ android:layout_marginRight="16dip"\r
++ android:enabled="false"\r
++ android:onClick="onOkClick"\r
++ android:text="@string/setup_btn_connect"\r
++ android:textColor="@android:color/black" />\r
++\r
++ </LinearLayout>\r
++ \r
++ <Button\r
++ android:id="@+id/account_register"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_below="@id/buttons_layout"\r
++ android:layout_centerHorizontal="true"\r
++ android:onClick="onRegisterClick"\r
++ android:paddingTop="10dp"\r
++ android:paddingBottom="10dp"\r
++ android:textColor="#0000FF"\r
++ android:background="@android:color/transparent" />\r
++ \r
++ <Button\r
++ android:id="@+id/account_register"\r
++ android:layout_width="wrap_content"\r
++ android:layout_height="wrap_content"\r
++ android:layout_below="@id/buttons_layout"\r
++ android:layout_centerHorizontal="true"\r
++ android:onClick="onRegisterClick"\r
++ android:paddingTop="10dp"\r
++ android:paddingBottom="10dp"\r
++ android:textColor="#0000FF"\r
++ android:background="@android:color/transparent" />\r
++ <!-- android:text="@string/app_name @string/auth_register" /-->\r
++ \r
++ </RelativeLayout>\r
++ \r
++</ScrollView>\r
<string name="prefs_log_summary_history">This shows the recorded logs</string>
<string name="prefs_log_delete_history_button">Delete History</string>
- <string name="auth_host_url">URL</string>
+ <string name="auth_host_url">Server address</string>
<string name="auth_username">Username</string>
<string name="auth_password">Password</string>
<string name="auth_register">I am new to %1$s</string>
<string name="sync_string_contacts">Contacts</string>
<string name="sync_fail_ticker">Synchronization failed</string>
<string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
- <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
- <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
+ <string name="sync_fail_content_unauthorized">Invalid credentials for %1$s</string>
+ <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
+ <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
<string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
<string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
<string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
<string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
<string name="auth_secure_connection">Secure connection established</string>
<string name="auth_login_details">Login details</string>
- <string name="auth_unauthorized">Invalid login / password</string>
+ <string name="auth_unauthorized">Invalid credentials</string>
+ <string name="auth_oauth_error">Unsuccessful authorization</string>
+ <string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
<string name="auth_not_found">Wrong path given</string>
<string name="auth_internal">Internal server error, code %1$d</string>
+ <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
+ <string name="auth_expired_oauth_token_toast">Your authorization expired.\nPlease, authorize again</string>
+ <string name="auth_expired_basic_auth_toast">Your saved credentials are invalid.\nPlease, enter the current credentials</string>
+
<string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
<string name="crashlog_send_report">Send report</string>
<string name="crashlog_dont_send_report">Don\'t send report</string>
<string name="wait_a_moment">Wait a moment</string>
<string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
<string name="filedisplay_no_file_selected">No file was selected</string>
+
+ <string name="oauth_host_url">oAuth2 URL</string>
+ <string name="oauth_check_onoff">Login with oAuth2.</string>
+ <string name="oauth_login_connection">Connecting to oAuth2 server…</string>
+ <string name="oauth_code_validation_message">Please, open a web browser and go to:\n%1$s.\nValidate this code there:\n%2$s</string>
+ <string name="oauth_connection_url_unavailable">Connection to this URL not available.</string>
+
<string name="ssl_validator_title">Warning</string>
<string name="ssl_validator_header">The identity of the site could not be verified</string>
<string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
projects / pub / Android / ownCloud.git / commitdiff