diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-31 16:13:53 +0000 |
| commit | 2ca4318cc1ee57dda907ba2069bd61d162b1baef (patch) | |
| tree | e282668a9587cf6c1ec7b604dea860400c75c6c7 /java/com/android/voicemail/impl/res/values | |
| parent | 68038172793ee0e2ab3e2e56ddfbeb82879d1f58 (diff) | |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/voicemail/impl/res/values')
| -rw-r--r-- | java/com/android/voicemail/impl/res/values/strings.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/com/android/voicemail/impl/res/values/strings.xml b/java/com/android/voicemail/impl/res/values/strings.xml index 375a1e9ba..66c0e62b0 100644 --- a/java/com/android/voicemail/impl/res/values/strings.xml +++ b/java/com/android/voicemail/impl/res/values/strings.xml @@ -61,11 +61,6 @@ <string name="voicemail_change_pin_preference_summary_disable">Visual voicemail must be enabled to change PIN</string> <string name="voicemail_change_pin_preference_summary_not_activated">Visual voicemail is not activated yet, please try again later</string> - <!-- Hint for the old PIN field in the change vociemail PIN dialog --> - <string name="vm_change_pin_old_pin">Old PIN</string> - <!-- Hint for the new PIN field in the change vociemail PIN dialog --> - <string name="vm_change_pin_new_pin">New PIN</string> - <!-- Message on the dialog when PIN changing is in progress --> <string name="vm_change_pin_progress_message">Please wait.</string> <!-- Error message for the voicemail PIN change if the PIN is too short --> @@ -107,4 +102,8 @@ <string name="change_pin_succeeded">Voicemail PIN updated</string> <!-- The error message to show if the server reported an error while attempting to change the voicemail PIN --> <string name="change_pin_system_error">Unable to set PIN</string> + + <string name="vvm_config_override_load_current_key" translatable="false">vvm_config_override_load_current</string> + <string name="vvm_config_override_enabled_key" translatable="false">vvm_config_override_enabled</string> + </resources> |