diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/IntentProvider.java | 19 | ||||
| -rw-r--r-- | src/com/android/dialer/settings/SoundSettingsFragment.java | 8 |
3 files changed, 5 insertions, 24 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 87ec774a8..15ba5df16 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -77,8 +77,6 @@ public class CallDetailActivity extends Activity { public static final String EXTRA_CALL_LOG_IDS = "EXTRA_CALL_LOG_IDS"; /** If we are started with a voicemail, we'll find the uri to play with this extra. */ public static final String EXTRA_VOICEMAIL_URI = "EXTRA_VOICEMAIL_URI"; - /** If we should immediately start playback of the voicemail, this extra will be set to true. */ - public static final String EXTRA_VOICEMAIL_START_PLAYBACK = "EXTRA_VOICEMAIL_START_PLAYBACK"; /** If the activity was triggered from a notification. */ public static final String EXTRA_FROM_NOTIFICATION = "EXTRA_FROM_NOTIFICATION"; diff --git a/src/com/android/dialer/calllog/IntentProvider.java b/src/com/android/dialer/calllog/IntentProvider.java index d7a35e8ad..a11d00bc2 100644 --- a/src/com/android/dialer/calllog/IntentProvider.java +++ b/src/com/android/dialer/calllog/IntentProvider.java @@ -83,24 +83,6 @@ public abstract class IntentProvider { }; } - public static IntentProvider getPlayVoicemailIntentProvider(final long rowId, - final String voicemailUri) { - return new IntentProvider() { - @Override - public Intent getIntent(Context context) { - Intent intent = new Intent(context, CallDetailActivity.class); - intent.setData(ContentUris.withAppendedId( - Calls.CONTENT_URI_WITH_VOICEMAIL, rowId)); - if (voicemailUri != null) { - intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_URI, - Uri.parse(voicemailUri)); - } - intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_START_PLAYBACK, true); - return intent; - } - }; - } - public static IntentProvider getSendSmsIntentProvider(final String number) { return new IntentProvider() { @Override @@ -129,7 +111,6 @@ public abstract class IntentProvider { intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_URI, Uri.parse(voicemailUri)); } - intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_START_PLAYBACK, false); if (extraIds != null && extraIds.length > 0) { intent.putExtra(CallDetailActivity.EXTRA_CALL_LOG_IDS, extraIds); diff --git a/src/com/android/dialer/settings/SoundSettingsFragment.java b/src/com/android/dialer/settings/SoundSettingsFragment.java index 43297b5e5..c7bb2d361 100644 --- a/src/com/android/dialer/settings/SoundSettingsFragment.java +++ b/src/com/android/dialer/settings/SoundSettingsFragment.java @@ -28,6 +28,7 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.provider.Settings; +import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; import com.android.dialer.R; @@ -208,8 +209,9 @@ public class SoundSettingsFragment extends PreferenceFragment } private boolean shouldHideCarrierSettings() { - int hideCarrierNetworkSetting = Settings.Global.getInt(getActivity().getContentResolver(), - Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, SHOW_CARRIER_SETTINGS); - return hideCarrierNetworkSetting == HIDE_CARRIER_SETTINGS; + CarrierConfigManager configManager = (CarrierConfigManager) getActivity().getSystemService( + Context.CARRIER_CONFIG_SERVICE); + return configManager.getConfig().getBoolean( + CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL); } } |