pull/177/head
M66B 5 years ago
parent 4976902cc6
commit d1804d80a7

@ -1310,7 +1310,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_password, null);
etPassword1 = dview.findViewById(R.id.tilPassword1);
etPassword2 = dview.findViewById(R.id.tilPassword2);
TextView tvImportHint = dview.findViewById(R.id.tvImporthint);
TextView tvExportHint = dview.findViewById(R.id.tvExportHint);
TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
if (savedInstanceState != null) {
etPassword1.getEditText().setText(savedInstanceState.getString("fair:password1"));
@ -1318,6 +1319,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}
etPassword2.setVisibility(export ? View.VISIBLE : View.GONE);
tvExportHint.setVisibility(export ? View.VISIBLE : View.GONE);
tvImportHint.setVisibility(export ? View.GONE : View.VISIBLE);
return new AlertDialog.Builder(getContext())

@ -47,12 +47,22 @@
</com.google.android.material.textfield.TextInputLayout>
<eu.faircode.email.FixedTextView
android:id="@+id/tvImporthint"
android:id="@+id/tvExportHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_import_do"
android:text="@string/title_setup_export_do"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvImportHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_import_do"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvExportHint" />
</androidx.constraintlayout.widget.ConstraintLayout>

@ -198,6 +198,7 @@
<string name="title_setup_export">Export settings</string>
<string name="title_setup_import">Import settings</string>
<string name="title_setup_export_do">Gmail accounts linked to on-device Google accounts cannot be exported</string>
<string name="title_setup_import_do">Imported accounts will be added without overwriting any existing ones</string>
<string name="title_setup_password">Password</string>
<string name="title_setup_password_chars">Password contains control or whitespace characters</string>

Loading…
Cancel
Save