mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed export hint

This commit is contained in:
M66B 2020-07-02 18:52:45 +02:00
parent 437cf53ba2
commit 0112cd2b99
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -1320,7 +1320,6 @@ 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 tvExportHint = dview.findViewById(R.id.tvExportHint);
TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
if (savedInstanceState != null) {
@ -1329,7 +1328,6 @@ 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())

12
app/src/main/res/layout/dialog_password.xml
View File

@ -46,16 +46,6 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
</com.google.android.material.textfield.TextInputLayout>
<eu.faircode.email.FixedTextView
android:id="@+id/tvExportHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
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"
@ -64,5 +54,5 @@
android:text="@string/title_setup_import_do"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvExportHint" />
app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/values/strings.xml
View File

@ -204,7 +204,6 @@
<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>