Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b591c2 authored by Christopher Tate's avatar Christopher Tate
Browse files

Use string resources instead of inline literals for progress toasts 

...in the full backup/restore confirmation UI.

Change-Id: I858a2d7017450f016afe5052aa37161a1c89c281
parent f9fa7543

packages/BackupRestoreConfirmation/res/values/strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -43,4 +43,15 @@ 


    <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->

    <string name="restore_enc_password_text">If the restore data is encrypted, please enter the password below:</string>



    <!-- Text of a toast telling the user that a full backup operation has begun -->

    <string name="toast_backup_started">Backup starting...</string>

    <!-- Text of a toast telling the user that a full backup operation has ended -->

    <string name="toast_backup_ended">Backup finished</string>

    <!-- Text of a toast telling the user that a full restore operation has begun -->

    <string name="toast_restore_started">Restore starting...</string>

    <!-- Text of a toast telling the user that a full restore operation has ended -->

    <string name="toast_restore_ended">Restore ended</string>

    <!-- Text of a toast telling the user that the operation has timed out -->

    <string name="toast_timeout">Operation timed out</string>

</resources>

packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java

+5 −5
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class BackupRestoreConfirmation extends Activity { 
        public void handleMessage(Message msg) {

            switch (msg.what) {

                case MSG_START_BACKUP: {

                    Toast.makeText(mContext, "!!! Backup starting !!!", Toast.LENGTH_LONG).show();

                    Toast.makeText(mContext, R.string.toast_backup_started, Toast.LENGTH_LONG).show();

                }

                break;
@@ -93,13 +93,13 @@ public class BackupRestoreConfirmation extends Activity { 
                break;



                case MSG_END_BACKUP: {

                    Toast.makeText(mContext, "!!! Backup ended !!!", Toast.LENGTH_SHORT).show();

                    Toast.makeText(mContext, R.string.toast_backup_ended, Toast.LENGTH_LONG).show();

                    finish();

                }

                break;



                case MSG_START_RESTORE: {

                    Toast.makeText(mContext, "!!! Restore starting !!!", Toast.LENGTH_LONG).show();

                    Toast.makeText(mContext, R.string.toast_restore_started, Toast.LENGTH_LONG).show();

                }

                break;
@@ -110,13 +110,13 @@ public class BackupRestoreConfirmation extends Activity { 
                break;



                case MSG_END_RESTORE: {

                    Toast.makeText(mContext, "!!! Restore ended !!!", Toast.LENGTH_SHORT).show();

                    Toast.makeText(mContext, R.string.toast_restore_ended, Toast.LENGTH_SHORT).show();

                    finish();

                }

                break;



                case MSG_TIMEOUT: {

                    Toast.makeText(mContext, "!!! TIMED OUT !!!", Toast.LENGTH_LONG).show();

                    Toast.makeText(mContext, R.string.toast_timeout, Toast.LENGTH_LONG).show();

                }

                break;

            }