kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backup: better description of the replace switch

Browse source
This commit is contained in:
Jakob Nixdorf 2017-11-21 07:57:58 +01:00
parent 716f530566
commit cd5dec666a
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/res/layout/content_backup.xml
View file

@ -196,23 +196,36 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin"
android:layout_gravity="center"
android:padding="@dimen/activity_margin"
android:background="?android:attr/selectableItemBackground" >
<CheckedTextView
android:id="@+id/backup_replace_label"
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/backup_replace"
android:text="@string/backup_desc_replace"
android:textAppearance="?android:attr/textAppearanceListItem" />
android:layout_toStartOf="@id/backup_replace" >
<TextView
android:id="@+id/backup_replace_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/backup_title_replace"
android:textAppearance="?android:attr/textAppearanceListItem" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/backup_desc_replace"/>
</LinearLayout>
<Switch
android:id="@+id/backup_replace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerInParent="true"
android:checked="true" />
</RelativeLayout>

6
app/src/main/res/values/strings_backup.xml
View file

@ -13,6 +13,8 @@
<string name="backup_title_import_crypt">Restore (encrypted)</string>
<string name="backup_title_import_openpgp">Restore (OpenPGP)</string>
<string name="backup_title_replace">Replace existing entries</string>
<string name="backup_desc_export_plain">Backup all accounts in a plain-text JSON file</string>
<string name="backup_desc_export_crypt">Backup all accounts in a password-protected JSON file</string>
<string name="backup_desc_export_openpgp">Backup all accounts in an OpenPGP-encrypted JSON file</string>
@ -31,7 +33,9 @@
before you can create encrypted backups.
</string>
<string name="backup_desc_replace">Replace already existing entries</string>
<string name="backup_desc_replace">If enabled all old entries are replaced when importing a
backup and only the backup is present. If disabled the old entries and the backups content
are merged.</string>
<!-- Dialogs -->
<string name="backup_dialog_title_security_warning">Security warning</string>