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

Commit 93a51cc5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Implement non-ui logic for delete/undo delete voicemails"

parents 261cba95 362350a5

java/com/android/dialer/app/res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ 
  <!-- Text for snackbar to undo a voicemail delete. [CHAR LIMIT=30] -->

  <string name="snackbar_voicemail_deleted">Voicemail deleted</string>



  <!-- Text for undo button in snackbar for voicemail deletion. [CHAR LIMIT=10] -->

  <string name="snackbar_voicemail_deleted_undo">UNDO</string>



  <!-- Title of the confirmation dialog for clearing the call log. [CHAR LIMIT=37]  -->

  <string name="clearCallLogConfirmation_title">Clear call history?</string>

java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class VoicemailPlaybackLayout extends LinearLayout 
                  Snackbar.LENGTH_LONG)

              .setDuration(VOICEMAIL_DELETE_DELAY_MS)

              .setAction(

                  R.string.snackbar_voicemail_deleted_undo,

                  R.string.snackbar_undo,

                  new View.OnClickListener() {

                    @Override

                    public void onClick(View view) {

java/com/android/dialer/blocking/BlockNumberDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public class BlockNumberDialogFragment extends DialogFragment { 
                };



            Snackbar.make(parentView, message, Snackbar.LENGTH_LONG)

                .setAction(R.string.block_number_undo, undoListener)

                .setAction(R.string.snackbar_undo, undoListener)

                .setActionTextColor(actionTextColor)

                .show();
@@ -295,7 +295,7 @@ public class BlockNumberDialogFragment extends DialogFragment { 
                };



            Snackbar.make(parentView, message, Snackbar.LENGTH_LONG)

                .setAction(R.string.block_number_undo, undoListener)

                .setAction(R.string.snackbar_undo, undoListener)

                .setActionTextColor(actionTextColor)

                .show();

java/com/android/dialer/blocking/res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ 
    <xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>unblocked

  </string>



  <!-- Text for undo button in snackbar for blocking/unblocking number. [CHAR LIMIT=10] -->

  <string name="block_number_undo">UNDO</string>



  <!-- Error toast message for when send to voicemail import fails. [CHAR LIMIT=40] -->

  <string name="send_to_voicemail_import_failed">Import failed</string>

java/com/android/dialer/common/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -19,4 +19,6 @@ 
  <string name="network_name_mobile">Mobile</string>

  <!-- Content description for the overflow menu button. [CHAR LIMIT=NONE] -->

  <string name="content_description_overflow">More options</string>

  <!-- Text for undo button in snackbar for voicemail deletion/blocking/unblocking number. [CHAR LIMIT=10] -->

  <string name="snackbar_undo">UNDO</string>

</resources>