Skip to content

Commit

Permalink
Adapt reuse backup screen after designer input
Browse files Browse the repository at this point in the history
  • Loading branch information
grote committed Sep 24, 2024
1 parent ddf8983 commit c5870e0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 22 deletions.
16 changes: 0 additions & 16 deletions app/src/main/res/drawable/ic_cloud_arrow_right.xml

This file was deleted.

11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_cloud_reuse.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/textColorSecondary"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#5f6368"
android:pathData="M21.9,12.5c-0.8,-0.9 -1.7,-1.4 -2.9,-1.5 0,-2 -0.7,-3.6 -2,-5s-3,-2 -5,-2 -3,0.5 -4.2,1.4 -2.1,2.2 -2.5,3.7c-1.3,0.3 -2.3,0.9 -3.1,1.9s-1.2,2.2 -1.2,3.5 0.5,2.8 1.6,3.8 2.4,1.6 3.9,1.6h12c1.2,0 2.3,-0.4 3.2,-1.3s1.3,-1.9 1.3,-3.2 -0.4,-2.2 -1.1,-3ZM10.5,17.4c-0.8,-0.4 -1.5,-0.9 -2,-1.7 -0.5,-0.8 -0.8,-1.6 -0.8,-2.6s0,-0.4 0,-0.6 0,-0.4 0,-0.6l-0.5,0.3 -0.5,-0.8 2.2,-1.3 1.3,2.2 -0.8,0.5 -0.6,-1.1c0,0.2 -0.1,0.4 -0.2,0.7 0,0.2 0,0.5 0,0.7 0,0.8 0.2,1.4 0.6,2.1s1,1.1 1.6,1.4l-0.5,0.8ZM10.2,10.2l-0.5,-0.8c0.4,-0.3 0.8,-0.5 1.3,-0.6 0.5,-0.2 0.9,-0.2 1.5,-0.2s1.2,0.1 1.8,0.3 1.1,0.6 1.5,1v-0.6h0.9v2.6h-2.6v-0.9h1.3c-0.4,-0.4 -0.8,-0.8 -1.3,-1 -0.5,-0.2 -1,-0.4 -1.6,-0.4s-0.8,0 -1.2,0.2c-0.4,0.1 -0.7,0.3 -1,0.6ZM16.2,16c-0.6,0.8 -1.4,1.4 -2.4,1.7l0.5,0.3 -0.5,0.8 -2.2,-1.3 1.3,-2.2 0.8,0.5 -0.7,1.1c0.9,-0.1 1.7,-0.5 2.3,-1.2 0.6,-0.7 0.9,-1.5 0.9,-2.5s0,-0.2 0,-0.2c0,0 0,-0.1 0,-0.2h0.9c0,0 0,0.2 0,0.2 0,0 0,0.2 0,0.2 0,1 -0.3,2 -0.9,2.8Z"
android:strokeWidth="0" />
</vector>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_recycle_backup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_cloud_arrow_right"
app:srcCompat="@drawable/ic_cloud_reuse"
app:tint="?android:colorAccent" />

<TextView
Expand All @@ -33,6 +33,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/restore_recycle_backup_text"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<string name="notification_channel_title">Backup notification</string>
<string name="notification_success_channel_title">Success notification</string>
<string name="notification_title">Backup running</string>
<string name="notification_init_text">Preparing existing backup data for re-use…</string>
<string name="notification_init_text">Preparing existing backup data for reuse…</string>
<string name="notification_apk_text">Backing up APK of %s</string>
<string name="notification_apk_not_backed_up">Saving list of apps we can not back up.</string>
<string name="notification_backup_already_running">Backup already in progress</string>
Expand Down Expand Up @@ -214,10 +214,10 @@
<string name="restore_set_empty_result">No suitable backups found at given location.\n\nThis is most likely due to a wrong recovery code or a storage error.</string>
<string name="restore_select_packages">Select apps to restore</string>
<string name="restore_select_packages_all">All of the following apps</string>
<string name="restore_recycle_backup_title">Re-use old backup?</string>
<string name="restore_recycle_backup_text">The ownership of the backup \'%s\' you just restored can be transferred to this device. This will make new backups faster and use less data.\n\nHowever, it will make the backup inaccessible for your old device. If you don\'t use your old device anymore, it is usually fine to re-use the backup.</string>
<string name="restore_recycle_backup_button_no">Don\'t re-use</string>
<string name="restore_recycle_backup_button_yes">Re-use backup</string>
<string name="restore_recycle_backup_title">Reuse this backup?</string>
<string name="restore_recycle_backup_text">You can reuse the backup \'%s\' you just restored on this device. This will make new backups faster and use less data.\n\nHowever, your old device will lose access to this backup. If you would like to keep the access for your old device, you can create a new backup instead. This will use more data than reusing the existing backup.</string>
<string name="restore_recycle_backup_button_no">Create new backup</string>
<string name="restore_recycle_backup_button_yes">Reuse backup</string>
<string name="restore_installing_packages">Re-installing apps</string>
<string name="restore_app_status_installing">Re-installing</string>
<string name="restore_app_status_installed">Re-installed</string>
Expand Down

0 comments on commit c5870e0

Please sign in to comment.