diff options
| author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-05-18 17:37:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-20 12:19:06 -0700 |
| commit | de14363878ea77eb3975358222077d7d3ed582dd (patch) | |
| tree | a1b0a77a222e573dbc9357343d2229bcbaaa88b0 | |
| parent | 746e8d40e4ada8d9a90c63c78c13b40fe63ccb3f (diff) | |
| download | packages_apps_Dialer-de14363878ea77eb3975358222077d7d3ed582dd.tar.gz packages_apps_Dialer-de14363878ea77eb3975358222077d7d3ed582dd.tar.bz2 packages_apps_Dialer-de14363878ea77eb3975358222077d7d3ed582dd.zip | |
Add negative option to caller info disable dialog
Change-Id: Ia0c420f89e22467f2a19c879c47e812c10f88945
issue-id: OPO-724
| -rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/settings/DialerSettingsActivity.java | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index fe459651d..845870fbe 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -136,7 +136,8 @@ <!-- CallerInfo Provider Settings strings --> <string name="callerinfo_provider_auth_yes">Yes</string> - <string name="callerinfo_provider_auth_no">No thanks</string> + <string name="callerinfo_provider_auth_no">No</string> + <string name="callerinfo_provider_auth_no_thanks">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 eb0a0dccc..0e98581b9 100644 --- a/src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java +++ b/src/com/android/dialer/callerinfo/CallerInfoProviderPicker.java @@ -177,7 +177,8 @@ 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), + nudge.addButton(new DialogNudge.Button( + res.getString(R.string.callerinfo_provider_auth_no_thanks), 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 0dfcd195f..cbebac837 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -423,6 +423,13 @@ public class DialerSettingsActivity extends PreferenceActivity { AmbientConnection.CLIENT.get(getContext().getApplicationContext())); } }); + builder.setNegativeButton(R.string.callerinfo_provider_auth_no, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // No-op + } + }); builder.show(); } |