diff options
| author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-05-20 12:37:17 -0700 |
|---|---|---|
| committer | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-05-20 12:52:40 -0700 |
| commit | e41bb9ba6fbc8c10baebdd31e43bccdd034d1a96 (patch) | |
| tree | 4650870387db1d68db27c687e35d4b40bc27ca6d | |
| parent | de14363878ea77eb3975358222077d7d3ed582dd (diff) | |
| download | packages_apps_Dialer-e41bb9ba6fbc8c10baebdd31e43bccdd034d1a96.tar.gz packages_apps_Dialer-e41bb9ba6fbc8c10baebdd31e43bccdd034d1a96.tar.bz2 packages_apps_Dialer-e41bb9ba6fbc8c10baebdd31e43bccdd034d1a96.zip | |
Refactor CallerInfo strings to simplify translations
Reverting back to original string definition before change caused
by Ia0c420f89e22467f2a19c879c47e812c10f88945
Change-Id: Iaf090024807e9e5529e53f3ada11b220af6773d3
issue-id: OPO-724
| -rw-r--r-- | res/values/cm_strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/settings/DialerSettingsActivity.java | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 845870fbe..f7bd4d777 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -136,8 +136,8 @@ <!-- CallerInfo Provider Settings strings --> <string name="callerinfo_provider_auth_yes">Yes</string> - <string name="callerinfo_provider_auth_no">No</string> - <string name="callerinfo_provider_auth_no_thanks">No thanks</string> + <string name="callerinfo_provider_auth_no_short">No</string> + <string name="callerinfo_provider_auth_no">No thanks</string> <string name="callerinfo_provider_auth_access"><xliff:g id="provider_name">%s</xliff:g> will have access to your contacts, Me profile, and Cyanogen OS account, which may include your email address.</string> <string name="callerinfo_provider_auth_learn_more">Learn more</string> <string name="callerinfo_provider_auth_desc">Welcome! Would you like <xliff:g id="provider_name">%s</xliff:g> to identify unknown callers and block unwanted calls?</string> diff --git a/src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java b/src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java index 0e98581b9..eb0a0dccc 100644 --- a/src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java +++ b/src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java @@ -177,8 +177,7 @@ public class CallerInfoProviderPicker { nudge.addButton(new DialogNudge.Button(res.getString(R.string.callerinfo_provider_auth_yes), AlertDialog.BUTTON_POSITIVE, positivePendingIntent)); - nudge.addButton(new DialogNudge.Button( - res.getString(R.string.callerinfo_provider_auth_no_thanks), + nudge.addButton(new DialogNudge.Button(res.getString(R.string.callerinfo_provider_auth_no), AlertDialog.BUTTON_NEGATIVE, negativePendingIntent)); DiscoveryManagerServices.DiscoveryManagerApi. diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java index cbebac837..52d91104d 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -423,7 +423,7 @@ public class DialerSettingsActivity extends PreferenceActivity { AmbientConnection.CLIENT.get(getContext().getApplicationContext())); } }); - builder.setNegativeButton(R.string.callerinfo_provider_auth_no, + builder.setNegativeButton(R.string.callerinfo_provider_auth_no_short, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { |