From e4ea104a18417115f35983bd4872bfe22a66bdfd Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Wed, 13 Aug 2014 17:10:43 -0700 Subject: Add "general settings" settings menu in Dialer + Add new fragment/preference screen xml for general settings. + Some settings are moved from Telephony's call settings. Logic in the general settings fragment is mostl taken from the CallFeaturesSetting PreferenceActivity.. + Some settings are contact display options which have been moved into this menu. + Moved DefaultRingtonePreference from Telephony. Bug: 16788935 Change-Id: I28677bfdcb2cb17bce4981c01b6c03d4effa0a7e --- res/values/strings.xml | 35 ++++- res/xml/general_settings.xml | 83 +++++++++++ .../dialer/settings/DefaultRingtonePreference.java | 54 +++++++ .../dialer/settings/DialerSettingsActivity.java | 10 +- .../dialer/settings/GeneralSettingsFragment.java | 159 +++++++++++++++++++++ 5 files changed, 334 insertions(+), 7 deletions(-) create mode 100644 res/xml/general_settings.xml create mode 100644 src/com/android/dialer/settings/DefaultRingtonePreference.java create mode 100644 src/com/android/dialer/settings/GeneralSettingsFragment.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 455fd5d50..509836995 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -776,9 +776,40 @@ + + General settings + + + Contact display, sounds, and quick responses + + + Contact display options + + + Sounds and Vibrate + + + Phone ringtone + + + Vibrate when ringing + + + Dialpad touch tones + + + Other + + + Quick responses + - Call Settings + Call settings - Ringtones, voicemail settings, VoIP calling, etc + Voicemail, call waiting, and others + diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml new file mode 100644 index 000000000..ecccdfd29 --- /dev/null +++ b/res/xml/general_settings.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/android/dialer/settings/DefaultRingtonePreference.java b/src/com/android/dialer/settings/DefaultRingtonePreference.java new file mode 100644 index 000000000..c12e7175a --- /dev/null +++ b/src/com/android/dialer/settings/DefaultRingtonePreference.java @@ -0,0 +1,54 @@ +/* + * 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.dialer.settings; + +import android.content.Context; +import android.content.Intent; +import android.media.RingtoneManager; +import android.net.Uri; +import android.preference.RingtonePreference; +import android.util.AttributeSet; + +/** + * RingtonePreference which doesn't show default ringtone setting. + */ +public class DefaultRingtonePreference extends RingtonePreference { + public DefaultRingtonePreference(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onPrepareRingtonePickerIntent(Intent ringtonePickerIntent) { + super.onPrepareRingtonePickerIntent(ringtonePickerIntent); + + /* + * Since this preference is for choosing the default ringtone, it + * doesn't make sense to show a 'Default' item. + */ + ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false); + } + + @Override + protected void onSaveRingtone(Uri ringtoneUri) { + RingtoneManager.setActualDefaultRingtoneUri(getContext(), getRingtoneType(), ringtoneUri); + } + + @Override + protected Uri onRestoreRingtone() { + return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType()); + } +} diff --git a/src/com/android/dialer/settings/DialerSettingsActivity.java b/src/com/android/dialer/settings/DialerSettingsActivity.java index b47a4edd2..db4513594 100644 --- a/src/com/android/dialer/settings/DialerSettingsActivity.java +++ b/src/com/android/dialer/settings/DialerSettingsActivity.java @@ -19,7 +19,6 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.TextView; -import com.android.contacts.common.preference.DisplayOptionsPreferenceFragment; import com.android.dialer.DialtactsActivity; import com.android.dialer.R; import com.android.dialerbind.analytics.AnalyticsPreferenceActivity; @@ -44,10 +43,11 @@ public class DialerSettingsActivity extends AnalyticsPreferenceActivity { @Override public void onBuildHeaders(List
target) { - final Header contactDisplayHeader = new Header(); - contactDisplayHeader.titleRes = R.string.settings_contact_display_options_title; - contactDisplayHeader.fragment = DisplayOptionsPreferenceFragment.class.getName(); - target.add(contactDisplayHeader); + final Header generalSettingsHeader = new Header(); + generalSettingsHeader.titleRes = R.string.general_settings_label; + generalSettingsHeader.summaryRes = R.string.general_settings_description; + generalSettingsHeader.fragment = GeneralSettingsFragment.class.getName(); + target.add(generalSettingsHeader); // Only add the call settings header if the current user is the primary/owner user. if (isPrimaryUser()) { diff --git a/src/com/android/dialer/settings/GeneralSettingsFragment.java b/src/com/android/dialer/settings/GeneralSettingsFragment.java new file mode 100644 index 000000000..d04fae398 --- /dev/null +++ b/src/com/android/dialer/settings/GeneralSettingsFragment.java @@ -0,0 +1,159 @@ +/* + * 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.dialer.settings; + +import android.content.Context; +import android.media.RingtoneManager; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.os.Vibrator; +import android.preference.CheckBoxPreference; +import android.preference.Preference; +import android.preference.PreferenceCategory; +import android.preference.PreferenceFragment; +import android.preference.PreferenceScreen; +import android.provider.Settings; + +import com.android.dialer.R; +import com.android.phone.common.util.SettingsUtil; + +import java.lang.Boolean; +import java.lang.CharSequence; +import java.lang.Object; +import java.lang.Override; +import java.lang.Runnable; +import java.lang.String; +import java.lang.Thread; + +public class GeneralSettingsFragment extends PreferenceFragment + implements Preference.OnPreferenceChangeListener { + private static final String CATEGORY_SOUNDS_KEY = "dialer_general_sounds_category_key"; + private static final String BUTTON_RINGTONE_KEY = "button_ringtone_key"; + private static final String BUTTON_VIBRATE_ON_RING = "button_vibrate_on_ring"; + private static final String BUTTON_PLAY_DTMF_TONE = "button_play_dtmf_tone"; + private static final String BUTTON_RESPOND_VIA_SMS_KEY = "button_respond_via_sms_key"; + + private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1; + + private Context mContext; + + private Preference mRingtonePreference; + private CheckBoxPreference mVibrateWhenRinging; + private CheckBoxPreference mPlayDtmfTone; + private Preference mRespondViaSms; + + private Runnable mRingtoneLookupRunnable; + private final Handler mRingtoneLookupComplete = new Handler() { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MSG_UPDATE_RINGTONE_SUMMARY: + mRingtonePreference.setSummary((CharSequence) msg.obj); + break; + } + } + }; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mContext = getActivity().getApplicationContext(); + + addPreferencesFromResource(R.xml.general_settings); + + mRingtonePreference = findPreference(BUTTON_RINGTONE_KEY); + mVibrateWhenRinging = (CheckBoxPreference) findPreference(BUTTON_VIBRATE_ON_RING); + mPlayDtmfTone = (CheckBoxPreference) findPreference(BUTTON_PLAY_DTMF_TONE); + mRespondViaSms = findPreference(BUTTON_RESPOND_VIA_SMS_KEY); + + PreferenceCategory soundCategory = (PreferenceCategory) findPreference(CATEGORY_SOUNDS_KEY); + if (mVibrateWhenRinging != null) { + Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE); + if (vibrator != null && vibrator.hasVibrator()) { + mVibrateWhenRinging.setOnPreferenceChangeListener(this); + } else { + soundCategory.removePreference(mVibrateWhenRinging); + mVibrateWhenRinging = null; + } + } + + if (mPlayDtmfTone != null) { + mPlayDtmfTone.setOnPreferenceChangeListener(this); + mPlayDtmfTone.setChecked(Settings.System.getInt(mContext.getContentResolver(), + Settings.System.DTMF_TONE_WHEN_DIALING, 1) != 0); + } + + mRingtoneLookupRunnable = new Runnable() { + @Override + public void run() { + if (mRingtonePreference != null) { + SettingsUtil.updateRingtoneName( + mContext, + mRingtoneLookupComplete, + RingtoneManager.TYPE_RINGTONE, + mRingtonePreference, + MSG_UPDATE_RINGTONE_SUMMARY); + } + } + }; + } + + /** + * Supports onPreferenceChangeListener to look for preference changes. + * + * @param preference The preference to be changed + * @param objValue The value of the selection, NOT its localized display value. + */ + @Override + public boolean onPreferenceChange(Preference preference, Object objValue) { + if (preference == mVibrateWhenRinging) { + boolean doVibrate = (Boolean) objValue; + Settings.System.putInt(mContext.getContentResolver(), + Settings.System.VIBRATE_WHEN_RINGING, doVibrate ? 1 : 0); + } + return true; + } + + /** + * Click listener for toggle events. + */ + @Override + public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { + if (preference == mPlayDtmfTone) { + Settings.System.putInt(mContext.getContentResolver(), + Settings.System.DTMF_TONE_WHEN_DIALING, mPlayDtmfTone.isChecked() ? 1 : 0); + } else if (preference == mRespondViaSms) { + // Needs to return false for the intent to launch. + return false; + } + return true; + } + + @Override + public void onResume() { + super.onResume(); + + if (mVibrateWhenRinging != null) { + mVibrateWhenRinging.setChecked(SettingsUtil.getVibrateWhenRingingSetting(mContext)); + } + + // Lookup the ringtone name asynchronously. + new Thread(mRingtoneLookupRunnable).start(); + } +} -- cgit v1.2.3