diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 19:10:06 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-15 19:10:06 +0200 |
| commit | 8279f84eb88a80e197514f2ab94e0e91416a19e7 (patch) | |
| tree | 7cf1533e1a57af50e65341aea6bb7f1db900e20b /OpenKeychain/src/main/res | |
| parent | cad89f12e21568255d8892b8a3004ce85353d657 (diff) | |
| download | open-keychain-8279f84eb88a80e197514f2ab94e0e91416a19e7.tar.gz open-keychain-8279f84eb88a80e197514f2ab94e0e91416a19e7.tar.bz2 open-keychain-8279f84eb88a80e197514f2ab94e0e91416a19e7.zip | |
Add restore to backup fragment, cleanup, renamings
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/backup_restore_fragment.xml (renamed from OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml) | 22 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml b/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml index 96fba954b..ce97b7fd4 100644 --- a/OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml +++ b/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml @@ -61,6 +61,28 @@ android:text="@string/backup_public_keys" android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + style="@style/SectionHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/restore_section" /> + + <TextView + android:id="@+id/restore" + style="?android:attr/borderlessButtonStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:drawablePadding="8dp" + android:drawableRight="@drawable/ic_folder_grey_24dp" + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:text="@string/btn_decrypt_files" + android:textAppearance="?android:attr/textAppearanceMedium" /> + <View android:layout_width="match_parent" android:layout_height="1dip" diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml index 7bd919abc..7bd919abc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8dd1f1b50..f1154645d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1434,6 +1434,7 @@ <string name="backup_all">"All keys + your own keys"</string> <string name="backup_public_keys">"All keys"</string> <string name="backup_section">"Backup"</string> + <string name="restore_section">"Restore"</string> <!-- unsorted --> <string name="section_certifier_id">"Certifier"</string> |