Commit 545185a3 authored by Thomas Markiewicz's avatar Thomas Markiewicz

Changed login screen placeholder text to 'Librem One address' and...

Changed login screen placeholder text to 'Librem One address' and 'Passphrase'; added 'Librem One' provider defaults so that settings are autoconfigured based on the email domain name
parent 5abc3cc0
Pipeline #5052 passed with stage
in 3 minutes and 46 seconds
......@@ -48,6 +48,7 @@
android:id="@+id/show_password"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_marginTop="16dp"
android:text="@string/account_setup_basics_show_password" />
<com.fsck.k9.view.ClientCertificateSpinner
......@@ -61,6 +62,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:visibility="invisible"
custom:foldedLabel="@string/client_certificate_advanced_options"
custom:unFoldedLabel="@string/client_certificate_advanced_options" >
......
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/dividerHorizontal" />
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/manual_setup"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="invisible"
android:background="@drawable/selectable_item_background"
android:text="@string/account_setup_basics_manual_setup_action" />
<Button
android:id="@+id/next"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/selectable_item_background"
android:text="@string/next_action" />
</LinearLayout>
</merge>
\ No newline at end of file
......@@ -375,9 +375,9 @@ Please submit bug reports, contribute new features and ask questions at
<string name="quiet_time_ends">Quiet Time ends</string>
<string name="account_setup_basics_title">Set up a new account</string>
<string name="account_setup_basics_email_hint">Email address</string>
<string name="account_setup_basics_password_hint">Password</string>
<string name="account_setup_basics_show_password">Show password</string>
<string name="account_setup_basics_email_hint">Librem One address</string>
<string name="account_setup_basics_password_hint">Passphrase</string>
<string name="account_setup_basics_show_password">Show passphrase</string>
<string name="account_setup_basics_manual_setup_action">Manual setup</string>
<string name="account_setup_check_settings_title"/>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment