diff options
author | Eric Erfanian <erfanian@google.com> | 2017-02-22 16:32:36 -0800 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-01 09:56:52 -0800 |
commit | ccca31529c07970e89419fb85a9e8153a5396838 (patch) | |
tree | a7034c0a01672b97728c13282a2672771cd28baa /java/com/android/voicemailomtp/settings/VoicemailSettingsActivity.java | |
parent | e7ae4624ba6f25cb8e648db74e0d64c0113a16ba (diff) |
Update dialer sources.
Test: Built package and system image.
This change clobbers the old source, and is an export
from an internal Google repository.
The internal repository was forked form Android in March,
and this change includes modifications since then, to
near the v8 release.
Since the fork, we've moved code from monolithic to independent modules. In addition,
we've switched to Blaze/Bazel as the build sysetm. This export, however, still uses make.
New dependencies have been added:
- Dagger
- Auto-Value
- Glide
- Libshortcutbadger
Going forward, development will still be in Google3, and the Gerrit release
will become an automated export, with the next drop happening in ~ two weeks.
Android.mk includes local modifications from ToT.
Abridged changelog:
Bug fixes
● Not able to mute, add a call when using Phone app in multiwindow mode
● Double tap on keypad triggering multiple key and tones
● Reported spam numbers not showing as spam in the call log
● Crash when user tries to block number while Phone app is not set as default
● Crash when user picks a number from search auto-complete list
Visual Voicemail (VVM) improvements
● Share Voicemail audio via standard exporting mechanisms that support file attachment
(email, MMS, etc.)
● Make phone number, email and web sites in VVM transcript clickable
● Set PIN before declining VVM Terms of Service {Carrier}
● Set client type for outbound visual voicemail SMS {Carrier}
New incoming call and incall UI on older devices
(Android M)
● Updated Phone app icon
● New incall UI (large buttons, button labels)
● New and animated Answer/Reject gestures
Accessibility
● Add custom answer/decline call buttons on answer screen for touch exploration
accessibility services
● Increase size of touch target
● Add verbal feedback when a Voicemail fails to load
● Fix pressing of Phone buttons while in a phone call using Switch Access
● Fix selecting and opening contacts in talkback mode
● Split focus for ‘Learn More’ link in caller id & spam to help distinguish similar text
Other
● Backup & Restore for App Preferences
● Prompt user to enable Wi-Fi calling if the call ends due to out of service and Wi-Fi is
connected
● Rename “Dialpad” to “Keypad”
● Show "Private number" for restricted calls
● Delete unused items (vcard, add contact, call history) from Phone menu
Change-Id: I2a7e53532a24c21bf308bf0a6d178d7ddbca4958
Diffstat (limited to 'java/com/android/voicemailomtp/settings/VoicemailSettingsActivity.java')
-rw-r--r-- | java/com/android/voicemailomtp/settings/VoicemailSettingsActivity.java | 222 |
1 files changed, 222 insertions, 0 deletions
diff --git a/java/com/android/voicemailomtp/settings/VoicemailSettingsActivity.java b/java/com/android/voicemailomtp/settings/VoicemailSettingsActivity.java new file mode 100644 index 000000000..ac0df6fab --- /dev/null +++ b/java/com/android/voicemailomtp/settings/VoicemailSettingsActivity.java @@ -0,0 +1,222 @@ +/** + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.voicemailomtp.settings; + +import android.content.Intent; +import android.os.Bundle; +import android.preference.Preference; +import android.preference.PreferenceActivity; +import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; +import android.telecom.PhoneAccountHandle; +import android.text.TextUtils; +import android.util.Log; +import android.view.MenuItem; + +import com.android.voicemailomtp.OmtpConstants; +import com.android.voicemailomtp.OmtpVvmCarrierConfigHelper; +import com.android.voicemailomtp.R; +import com.android.voicemailomtp.SubscriptionInfoHelper; +import com.android.voicemailomtp.VisualVoicemailPreferences; + +public class VoicemailSettingsActivity extends PreferenceActivity implements + Preference.OnPreferenceChangeListener { + private static final String LOG_TAG = VoicemailSettingsActivity.class.getSimpleName(); + private static final boolean DBG = true; + + /** + * Intent action to bring up Voicemail Provider settings + * DO NOT RENAME. There are existing apps which use this intent value. + */ + public static final String ACTION_ADD_VOICEMAIL = + "com.android.voicemailomtp.CallFeaturesSetting.ADD_VOICEMAIL"; + + /** + * Intent action to bring up the {@code VoicemailSettingsActivity}. + * DO NOT RENAME. There are existing apps which use this intent value. + */ + public static final String ACTION_CONFIGURE_VOICEMAIL = + "com.android.voicemailomtp.CallFeaturesSetting.CONFIGURE_VOICEMAIL"; + + // Extra put in the return from VM provider config containing voicemail number to set + public static final String VM_NUMBER_EXTRA = "com.android.voicemailomtp.VoicemailNumber"; + // Extra put in the return from VM provider config containing call forwarding number to set + public static final String FWD_NUMBER_EXTRA = "com.android.voicemailomtp.ForwardingNumber"; + // Extra put in the return from VM provider config containing call forwarding number to set + public static final String FWD_NUMBER_TIME_EXTRA = "com.android.voicemailomtp.ForwardingNumberTime"; + // If the VM provider returns non null value in this extra we will force the user to + // choose another VM provider + public static final String SIGNOUT_EXTRA = "com.android.voicemailomtp.Signout"; + + /** + * String Extra put into ACTION_ADD_VOICEMAIL call to indicate which provider should be hidden + * in the list of providers presented to the user. This allows a provider which is being + * disabled (e.g. GV user logging out) to force the user to pick some other provider. + */ + public static final String IGNORE_PROVIDER_EXTRA = "com.android.voicemailomtp.ProviderToIgnore"; + + /** + * String Extra put into ACTION_ADD_VOICEMAIL to indicate that the voicemail setup screen should + * be opened. + */ + public static final String SETUP_VOICEMAIL_EXTRA = "com.android.voicemailomtp.SetupVoicemail"; + + /** Event for Async voicemail change call */ + private static final int EVENT_VOICEMAIL_CHANGED = 500; + private static final int EVENT_FORWARDING_CHANGED = 501; + private static final int EVENT_FORWARDING_GET_COMPLETED = 502; + + /** Handle to voicemail pref */ + private static final int VOICEMAIL_PREF_ID = 1; + private static final int VOICEMAIL_PROVIDER_CFG_ID = 2; + + /** + * Used to indicate that the voicemail preference should be shown. + */ + private boolean mShowVoicemailPreference = false; + + private int mSubId; + private PhoneAccountHandle mPhoneAccountHandle; + private SubscriptionInfoHelper mSubscriptionInfoHelper; + private OmtpVvmCarrierConfigHelper mOmtpVvmCarrierConfigHelper; + + private SwitchPreference mVoicemailVisualVoicemail; + private Preference mVoicemailChangePinPreference; + + //********************************************************************************************* + // Preference Activity Methods + //********************************************************************************************* + + @Override + protected void onCreate(Bundle icicle) { + super.onCreate(icicle); + + // Show the voicemail preference in onResume if the calling intent specifies the + // ACTION_ADD_VOICEMAIL action. + mShowVoicemailPreference = (icicle == null) && + TextUtils.equals(getIntent().getAction(), ACTION_ADD_VOICEMAIL); + + mSubscriptionInfoHelper = new SubscriptionInfoHelper(this, getIntent()); + mSubscriptionInfoHelper.setActionBarTitle( + getActionBar(), getResources(), R.string.voicemail_settings_with_label); + mSubId = mSubscriptionInfoHelper.getSubId(); + // TODO: scrap this activity. + /* + mPhoneAccountHandle = PhoneAccountHandleConverter + .fromSubId(this, mSubId); + + mOmtpVvmCarrierConfigHelper = new OmtpVvmCarrierConfigHelper( + this, mSubId); + */ + } + + @Override + protected void onResume() { + super.onResume(); + + PreferenceScreen preferenceScreen = getPreferenceScreen(); + if (preferenceScreen != null) { + preferenceScreen.removeAll(); + } + + addPreferencesFromResource(R.xml.voicemail_settings); + + PreferenceScreen prefSet = getPreferenceScreen(); + + mVoicemailVisualVoicemail = (SwitchPreference) findPreference( + getResources().getString(R.string.voicemail_visual_voicemail_key)); + + mVoicemailChangePinPreference = findPreference( + getResources().getString(R.string.voicemail_change_pin_key)); + Intent changePinIntent = new Intent(new Intent(this, VoicemailChangePinActivity.class)); + changePinIntent.putExtra(VoicemailChangePinActivity.EXTRA_PHONE_ACCOUNT_HANDLE, + mPhoneAccountHandle); + + mVoicemailChangePinPreference.setIntent(changePinIntent); + if (VoicemailChangePinActivity.isDefaultOldPinSet(this, mPhoneAccountHandle)) { + mVoicemailChangePinPreference.setTitle(R.string.voicemail_set_pin_dialog_title); + } else { + mVoicemailChangePinPreference.setTitle(R.string.voicemail_change_pin_dialog_title); + } + + if (mOmtpVvmCarrierConfigHelper.isValid()) { + mVoicemailVisualVoicemail.setOnPreferenceChangeListener(this); + mVoicemailVisualVoicemail.setChecked( + VisualVoicemailSettingsUtil.isEnabled(this, mPhoneAccountHandle)); + if (!isVisualVoicemailActivated()) { + prefSet.removePreference(mVoicemailChangePinPreference); + } + } else { + prefSet.removePreference(mVoicemailVisualVoicemail); + prefSet.removePreference(mVoicemailChangePinPreference); + } + } + + @Override + public void onPause() { + super.onPause(); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } + + /** + * Implemented to support onPreferenceChangeListener to look for preference changes. + * + * @param preference is the preference to be changed + * @param objValue should be the value of the selection, NOT its localized + * display value. + */ + @Override + public boolean onPreferenceChange(Preference preference, Object objValue) { + if (DBG) log("onPreferenceChange: \"" + preference + "\" changed to \"" + objValue + "\""); + if (preference.getKey().equals(mVoicemailVisualVoicemail.getKey())) { + boolean isEnabled = (boolean) objValue; + VisualVoicemailSettingsUtil + .setEnabled(this, mPhoneAccountHandle, isEnabled); + PreferenceScreen prefSet = getPreferenceScreen(); + if (isVisualVoicemailActivated()) { + prefSet.addPreference(mVoicemailChangePinPreference); + } else { + prefSet.removePreference(mVoicemailChangePinPreference); + } + } + + // Always let the preference setting proceed. + return true; + } + + private boolean isVisualVoicemailActivated() { + if (!VisualVoicemailSettingsUtil.isEnabled(this, mPhoneAccountHandle)) { + return false; + } + VisualVoicemailPreferences preferences = new VisualVoicemailPreferences(this, + mPhoneAccountHandle); + return preferences.getString(OmtpConstants.SERVER_ADDRESS, null) != null; + + } + + private static void log(String msg) { + Log.d(LOG_TAG, msg); + } +} |