diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 23:25:56 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-23 23:25:56 +0100 |
commit | 01b89d1d9ca3627772866b0bea0472f658bb4e81 (patch) | |
tree | cdfcf6861144e8f8b974ca0db97b3e9e48b6161b /OpenKeychain/src/main/res | |
parent | af8fd8db695e538de5250af8c9d0f6c19d260a01 (diff) | |
download | open-keychain-01b89d1d9ca3627772866b0bea0472f658bb4e81.tar.gz open-keychain-01b89d1d9ca3627772866b0bea0472f658bb4e81.tar.bz2 open-keychain-01b89d1d9ca3627772866b0bea0472f658bb4e81.zip |
Revert "Add first time wizard for sync settings"
This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10.
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/first_time_activity.xml | 85 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
2 files changed, 1 insertions, 86 deletions
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml deleted file mode 100644 index 36d32e22d..000000000 --- a/OpenKeychain/src/main/res/layout/first_time_activity.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include - android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> - - <!-- - fitsSystemWindows and layout_marginTop from - https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 - --> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@id/toolbar_include" - android:layout_marginTop="@dimen/minus_statusbar_height" - android:fitsSystemWindows="true"> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/first_time_buttons" - android:layout_alignParentTop="true" - android:fillViewport="true"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="16dp" - android:text="@string/first_time_start" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <FrameLayout - android:id="@+id/first_time_fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - </LinearLayout> - </ScrollView> - - <LinearLayout - android:id="@+id/first_time_buttons" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:background="?attr/colorButtonRow" - android:orientation="horizontal"> - - <TextView - android:id="@+id/first_time_next_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:clickable="true" - android:drawablePadding="8dp" - android:drawableRight="@drawable/ic_chevron_right_grey_24dp" - android:gravity="right|center_vertical" - android:minHeight="?android:attr/listPreferredItemHeight" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:text="@string/btn_next" - android:textAllCaps="true" - android:textAppearance="?android:attr/textAppearanceMedium" /> - </LinearLayout> - </RelativeLayout> - - </FrameLayout> -</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 295c7b1d8..38a619ad7 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1450,13 +1450,13 @@ <string name="keyserver_sync_orbot_notif_ignore">"Direct"</string> <!-- First Time --> + <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string> <string name="first_time_create_key">"Create my key"</string> <string name="first_time_import_key">"Import key from file"</string> <string name="first_time_yubikey">"Use YubiKey NEO"</string> <string name="first_time_skip">"Skip Setup"</string> <string name="first_time_blank_yubikey">"Would you like to use this blank YubiKey NEO with OpenKeychain?\n\nPlease take away the YubiKey now, you will be prompted when it is needed again!"</string> <string name="first_time_blank_yubikey_yes">"Use this YubiKey"</string> - <string name="first_time_start">"Welcome to OpenKeychain, please select your synchronization preferences.\n\nLinking keys to contacts allows you to view keys directly from Android contacts. This happens completly offline based on names and email addresses."</string> <string name="backup_text">"Backups that include your own keys must never be shared with other people!"</string> <string name="backup_all">"All keys + your own keys"</string> |