diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-05-03 18:36:24 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-05-03 19:22:38 +0300 |
| commit | bbf569b0e9a1a93e4fff8074cc180274fc1f2d24 (patch) | |
| tree | e43c3237b7a36d8d3f4881129cd977e93690f9db /app/src/main/res/layout | |
| parent | e3c4c1cb40ba229f50dd534c9edef42cb807ed18 (diff) | |
| parent | 1cc44ede8e6c605345d794452c099a07a49d2f49 (diff) | |
Merge branch 'master' into 916-settings
# Conflicts:
# app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
# app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClientV1.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_import_account.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/src/main/res/layout/activity_import_account.xml b/app/src/main/res/layout/activity_import_account.xml index 4ad83f02..ed072796 100644 --- a/app/src/main/res/layout/activity_import_account.xml +++ b/app/src/main/res/layout/activity_import_account.xml @@ -50,6 +50,19 @@ android:text="@string/choose_account" app:backgroundTint="@color/defaultBrand" /> + <TextView + android:id="@+id/status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/add_button" + android:layout_centerHorizontal="true" + android:layout_marginTop="32dp" + android:gravity="center_horizontal" + android:textAlignment="center" + android:textColor="@color/fg_secondary" + android:textSize="18sp" + tools:text="@string/you_have_to_be_connected_to_the_internet_in_order_to_add_an_account" /> + <ProgressBar android:id="@+id/progress_circular" android:layout_width="wrap_content" |