PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 12680faf: am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev

Browse Source 
* commit '12680fafb7bdf67a8cf624e3533321c7df2aa11a':
  Settings: Display 'Calls' category on non-voice devices.
This commit is contained in:
John Spurlock
2014-10-21 16:37:48 +00:00
committed by Android Git Automerger
parent a89b2721ef 12680fafb7
commit e519a16545
3 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -5639,9 +5639,6 @@
<!-- Sound & notification > Sound section: Title for the zen mode option. [CHAR LIMIT=60] -->
<string name="zen_mode_option_title">When calls and notifications arrive</string>
<!-- Sound & notification > Sound section: Title for the zen mode option for devices without voice. [CHAR LIMIT=60] -->
<string name="zen_mode_option_title_novoice">When notifications arrive</string>
<!-- Sound & notification > Sound section: Zen mode option: Off [CHAR LIMIT=60] -->
<string name="zen_mode_option_off">Always interrupt</string>
@@ -5840,8 +5837,8 @@
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: value when blank -->
<string name="zen_mode_entry_conditions_summary_none">Never</string>
<!-- [CHAR LIMIT=20] Zen mode settings: Phone calls option -->
<string name="zen_mode_phone_calls">Calls</string>
<!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
<string name="zen_mode_calls">Calls</string>
<!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
<string name="zen_mode_messages">Messages</string>

4
res/xml/zen_mode_settings.xml
View File

@@ -37,8 +37,8 @@
android:switchTextOn="" />
<SwitchPreference
android:key="phone_calls"
android:title="@string/zen_mode_phone_calls"
android:key="calls"
android:title="@string/zen_mode_calls"
android:persistent="false"
android:switchTextOff=""
android:switchTextOn="" />

28
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -51,8 +51,6 @@ import android.widget.TimePicker;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.notification.DropDownPreference.Callback;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
@@ -69,7 +67,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
private static final String KEY_ZEN_MODE = "zen_mode";
private static final String KEY_IMPORTANT = "important";
private static final String KEY_CALLS = "phone_calls";
private static final String KEY_CALLS = "calls";
private static final String KEY_MESSAGES = "messages";
private static final String KEY_STARRED = "starred";
private static final String KEY_EVENTS = "events";
@@ -105,12 +103,8 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
private static SparseArray<String> allKeyTitles(Context context) {
final SparseArray<String> rt = new SparseArray<String>();
rt.put(R.string.zen_mode_important_category, KEY_IMPORTANT);
if (Utils.isVoiceCapable(context)) {
rt.put(R.string.zen_mode_phone_calls, KEY_CALLS);
rt.put(R.string.zen_mode_calls, KEY_CALLS);
rt.put(R.string.zen_mode_option_title, KEY_ZEN_MODE);
} else {
rt.put(R.string.zen_mode_option_title_novoice, KEY_ZEN_MODE);
}
rt.put(R.string.zen_mode_messages, KEY_MESSAGES);
rt.put(R.string.zen_mode_from_starred, KEY_STARRED);
rt.put(R.string.zen_mode_events, KEY_EVENTS);
@@ -155,7 +149,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
mConfig = getZenModeConfig();
if (DEBUG) Log.d(TAG, "Loaded mConfig=" + mConfig);
final Preference zenMode = PREF_ZEN_MODE.init(this);
PREF_ZEN_MODE.init(this);
PREF_ZEN_MODE.setCallback(new SettingPrefWithCallback.Callback() {
@Override
public void onSettingSelected(int value) {
@@ -164,15 +158,11 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
}
}
});
if (!Utils.isVoiceCapable(mContext)) {
zenMode.setTitle(R.string.zen_mode_option_title_novoice);
}
final PreferenceCategory important =
(PreferenceCategory) root.findPreference(KEY_IMPORTANT);
mCalls = (SwitchPreference) important.findPreference(KEY_CALLS);
if (Utils.isVoiceCapable(mContext)) {
mCalls.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -185,10 +175,6 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
return setZenModeConfig(newConfig);
}
});
} else {
important.removePreference(mCalls);
mCalls = null;
}
mMessages = (SwitchPreference) important.findPreference(KEY_MESSAGES);
mMessages.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@@ -554,14 +540,6 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
}
return result;
}
public List<String> getNonIndexableKeys(Context context) {
final ArrayList<String> rt = new ArrayList<String>();
if (!Utils.isVoiceCapable(context)) {
rt.add(KEY_CALLS);
}
return rt;
}
};
private static class SettingPrefWithCallback extends SettingPref {