diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-16 19:22:24 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-17 19:21:59 +0000 |
commit | 9a090c89e7a0c43a668bd6e2ac5e5e680f323aed (patch) | |
tree | 2f55365aaf87df9ba7c1fe0be56a7d0988eadf30 /java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java | |
parent | 2df4538eb90b896be15eebc1d9adf1206131c8a3 (diff) |
Update AOSP Dialer source from internal google3 repository at cl/150392808
Test: Treehugger
Notable this release:
* Reintroduce localization.
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from 3/15/2017 to cl/150392808 (3/16/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: Ia16d68469c2ca1ff42c7fa31d922bdb78c4e244a
Diffstat (limited to 'java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java')
-rw-r--r-- | java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java | 49 |
1 files changed, 48 insertions, 1 deletions
diff --git a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java index a5b94a75e..8041e5b75 100644 --- a/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java +++ b/java/com/android/voicemail/impl/settings/VoicemailSettingsFragment.java @@ -19,6 +19,7 @@ import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; +import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.preference.SwitchPreference; @@ -71,7 +72,7 @@ public class VoicemailSettingsFragment extends PreferenceFragment @Override public void onResume() { super.onResume(); - + Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_SETTINGS_VIEWED); PreferenceScreen preferenceScreen = getPreferenceScreen(); if (preferenceScreen != null) { preferenceScreen.removeAll(); @@ -86,6 +87,16 @@ public class VoicemailSettingsFragment extends PreferenceFragment findPreference(getString(R.string.voicemail_notification_ringtone_key)); voicemailRingtonePreference.setVoicemailRingtoneNameChangeListener(this); voicemailRingtonePreference.init(phoneAccountHandle, oldRingtoneName); + voicemailRingtonePreference.setOnPreferenceClickListener( + new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Logger.get(getContext()) + .logImpression(DialerImpression.Type.VVM_CHANGE_RINGTONE_CLICKED); + // Let the preference handle the click. + return false; + } + }); voicemailVibration = (CheckBoxPreference) findPreference(getString(R.string.voicemail_notification_vibrate_key)); @@ -94,6 +105,16 @@ public class VoicemailSettingsFragment extends PreferenceFragment getContext() .getSystemService(TelephonyManager.class) .isVoicemailVibrationEnabled(phoneAccountHandle)); + voicemailVibration.setOnPreferenceClickListener( + new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Logger.get(getContext()) + .logImpression(DialerImpression.Type.VVM_CHANGE_VIBRATION_CLICKED); + // Let the preference handle the click. + return false; + } + }); voicemailVisualVoicemail = (SwitchPreference) findPreference(getString(R.string.voicemail_visual_voicemail_key)); @@ -116,6 +137,15 @@ public class VoicemailSettingsFragment extends PreferenceFragment VoicemailChangePinActivity.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle); voicemailChangePinPreference.setIntent(changePinIntent); + voicemailChangePinPreference.setOnPreferenceClickListener( + new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_CHANGE_PIN_CLICKED); + // Let the preference handle the click. + return false; + } + }); if (VoicemailChangePinActivity.isDefaultOldPinSet(getContext(), phoneAccountHandle)) { voicemailChangePinPreference.setTitle(R.string.voicemail_set_pin_dialog_title); } else { @@ -139,6 +169,16 @@ public class VoicemailSettingsFragment extends PreferenceFragment Intent advancedSettingsIntent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL); advancedSettingsIntent.putExtra(TelephonyManager.EXTRA_HIDE_PUBLIC_SETTINGS, true); advancedSettings.setIntent(advancedSettingsIntent); + voicemailChangePinPreference.setOnPreferenceClickListener( + new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Logger.get(getContext()) + .logImpression(DialerImpression.Type.VVM_ADVANCED_SETINGS_CLICKED); + // Let the preference handle the click. + return false; + } + }); } @Override @@ -158,6 +198,13 @@ public class VoicemailSettingsFragment extends PreferenceFragment if (preference.getKey().equals(voicemailVisualVoicemail.getKey())) { boolean isEnabled = (boolean) objValue; VisualVoicemailSettingsUtil.setEnabled(getContext(), phoneAccountHandle, isEnabled); + + if (isEnabled) { + Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_USER_ENABLED_IN_SETTINGS); + } else { + Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_USER_DISABLED_IN_SETTINGS); + } + PreferenceScreen prefSet = getPreferenceScreen(); if (isVisualVoicemailActivated()) { prefSet.addPreference(voicemailChangePinPreference); |