diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 500c0aa12cd..4bf8399c37c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1064,8 +1064,8 @@ + android:theme="@android:style/Theme.Material.Light.Voice" + android:label="@string/zen_mode_settings_title"> diff --git a/res/drawable/bg_voice_position.xml b/res/drawable/bg_voice_position.xml deleted file mode 100644 index 2fb29c260a4..00000000000 --- a/res/drawable/bg_voice_position.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/res/layout/voice_interaction.xml b/res/layout/voice_interaction.xml deleted file mode 100644 index ed0cd1acf46..00000000000 --- a/res/layout/voice_interaction.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - diff --git a/res/layout/voice_item_row.xml b/res/layout/voice_item_row.xml deleted file mode 100644 index eca5ac9033c..00000000000 --- a/res/layout/voice_item_row.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index 7aee58ae935..7b4d3b450d4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6223,72 +6223,6 @@ %s next day - - Interruptions - - - When calls and notifications arrive - - - When would you like to be interrupted? - - - For how long? - - - Always interrupt - - - off,all,everything - - - Allow only priority interruptions - - - important,priority,priority only,only priority,priority notifications - - - Allow only alarms - - - alarms,alarms only,only alarms - - - Don\u2019t interrupt - - - none,never,nothing,no interruptions - - - Indefinitely - - - - %d minute - %d minutes - - - - - %d hour - %d hours - - - - Change to priority notifications only indefinitely - - - - Change to priority notifications only for one minute until %2$s - Change to priority notifications only for %1$d minutes until %2$s - - - - - Change to priority notifications only for one hour until %2$s - Change to priority notifications only for %1$d hours (until %2$s) - - Change to alarms only indefinitely @@ -6304,27 +6238,9 @@ Change to alarms only for %1$d hours until %2$s - - Change to don\u2019t interrupt indefinitely - - - - Change to don\u2019t interrupt for one minute until %2$s - Change to don\u2019t interrupt for %1$d minutes (until %2$s) - - - - - Change to don\u2019t interrupt for one hour until %2$s - Change to don\u2019t interrupt for %1$d hours until %2$s - - Change to always interrupt - - forever - App notifications diff --git a/src/com/android/settings/notification/ZenModeVoiceActivity.java b/src/com/android/settings/notification/ZenModeVoiceActivity.java index 2994ed10eb5..71e56b099a5 100644 --- a/src/com/android/settings/notification/ZenModeVoiceActivity.java +++ b/src/com/android/settings/notification/ZenModeVoiceActivity.java @@ -20,24 +20,20 @@ import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES; import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED; import com.android.settings.R; -import com.android.settings.utils.VoiceSelectionAdapter; -import com.android.settings.utils.VoiceSelection; -import com.android.settings.utils.VoiceSelectionFragment; import com.android.settings.utils.VoiceSettingsActivity; -import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.os.UserHandle; +import android.media.AudioManager; import android.provider.Settings.Global; import android.service.notification.Condition; import android.service.notification.ZenModeConfig; import android.text.format.DateFormat; +import android.util.Log; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; /** @@ -50,97 +46,31 @@ public class ZenModeVoiceActivity extends VoiceSettingsActivity { @Override protected boolean onVoiceSettingInteraction(Intent intent) { - setContentView(R.layout.voice_interaction); - pickNotificationMode(intent); - return false; - } + if (intent.hasExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED)) { + int minutes = intent.getIntExtra(EXTRA_DO_NOT_DISTURB_MODE_MINUTES, -1); + Condition condition = null; + int mode = Global.ZEN_MODE_OFF; - /** - * Start a voice interaction to ask what kind of interruptions should - * be permitted. The intent can optionally include extra information about the type - * of interruptions desired or how long interruptions should be limited to that are - * used as hints. - */ - private void pickNotificationMode(final Intent intent) { - boolean enabled = intent.getBooleanExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED, false); - boolean specified = intent.hasExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED); - - setHeader(getString(R.string.zen_mode_interruptions_voice_header)); - - List states = new ArrayList(); - if (!specified || enabled) { - states.add(new ModeSelection(this, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, - R.string.zen_mode_option_voice_important_interruptions, - R.string.zen_mode_option_voice_important_synonyms)); - states.add(new ModeSelection(this, Global.ZEN_MODE_ALARMS, - R.string.zen_mode_option_voice_alarms, - R.string.zen_mode_option_voice_alarms_synonyms)); - states.add(new ModeSelection(this, Global.ZEN_MODE_NO_INTERRUPTIONS, - R.string.zen_mode_option_voice_no_interruptions, - R.string.zen_mode_option_voice_no_interruptions_synonyms)); - } - if (!specified || !enabled) { - states.add(new ModeSelection(this, Global.ZEN_MODE_OFF, - R.string.zen_mode_option_voice_all_interruptions, - R.string.zen_mode_option_voice_all_interruptions_synonyms)); - } - VoiceSelectionFragment fragment = new VoiceSelectionFragment(); - fragment.setArguments(VoiceSelectionFragment.createArguments( - getString(R.string.zen_mode_interruptions_voice_prompt))); - fragment.setListAdapter( - new VoiceSelectionAdapter(this, R.layout.voice_item_row, states)); - fragment.setOnItemSelectedHandler(new VoiceSelection.OnItemSelectedListener() { - @Override - public void onItemSelected(int index, VoiceSelection selection) { - int mode = ((ModeSelection) selection).mMode; - ConditionSelection conditionSelection = getConditionSelection( - intent.getIntExtra(EXTRA_DO_NOT_DISTURB_MODE_MINUTES, 0)); - if (mode != Global.ZEN_MODE_OFF) { - if (conditionSelection == null) { - pickDuration(selection.getLabel(), mode); - return; - } - setZenModeConfig(mode, conditionSelection.mCondition); - } else { - setZenModeConfig(Global.ZEN_MODE_OFF, null); + if (intent.getBooleanExtra(EXTRA_DO_NOT_DISTURB_MODE_ENABLED, false)) { + if (minutes > 0) { + condition = ZenModeConfig.toTimeCondition(this, minutes, UserHandle.myUserId()); } - notifySuccess(getChangeSummary(mode, conditionSelection)); - finish(); + mode = Global.ZEN_MODE_ALARMS; } - }); - showFragment(fragment, "pick_mode_fragment"); - } + setZenModeConfig(mode, condition); + notifySuccess(getChangeSummary(mode, minutes)); - /** - * Start a voice interaction to ask for the zen mode duration. - */ - private void pickDuration(CharSequence label, final int mode) { - setTitle(label.toString()); - setHeader(null); - - List states = new ArrayList(); - states.add(new ConditionSelection(null, -1, - getString(R.string.zen_mode_duration_indefinte_voice_label), - getString(R.string.zen_mode_duration_indefinite_voice_synonyms))); - for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) { - states.add(getConditionSelection(ZenModeConfig.MINUTE_BUCKETS[i])); + AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); + if (audioManager != null) { + // Show the current Zen Mode setting. + audioManager.adjustStreamVolume(AudioManager.STREAM_NOTIFICATION, + AudioManager.ADJUST_SAME, + AudioManager.FLAG_SHOW_UI); + } + } else { + Log.v(TAG, "Missing extra android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED"); } - - VoiceSelectionFragment fragment = new VoiceSelectionFragment(); - fragment.setArguments(VoiceSelectionFragment.createArguments( - getString(R.string.zen_mode_duration_voice_prompt))); - fragment.setListAdapter( - new VoiceSelectionAdapter(this, R.layout.voice_item_row, states)); - fragment.setOnItemSelectedHandler(new VoiceSelection.OnItemSelectedListener() { - @Override - public void onItemSelected(int index, VoiceSelection item) { - ConditionSelection selection = ((ConditionSelection) item); - setZenModeConfig(mode, selection.mCondition); - notifySuccess(getChangeSummary(mode, selection)); - finish(); - } - }); - showFragment(fragment, "pick_duration_fragment"); + return true; } private void setZenModeConfig(int mode, Condition condition) { @@ -149,12 +79,12 @@ public class ZenModeVoiceActivity extends VoiceSettingsActivity { } else { NotificationManager.from(this).setZenMode(mode, null, TAG); } - } + } /** * Produce a summary of the Zen mode change to be read aloud as TTS. */ - private CharSequence getChangeSummary(int mode, ConditionSelection duration) { + private CharSequence getChangeSummary(int mode, int minutes) { int indefinite = -1; int byMinute = -1; int byHour = -1; @@ -165,76 +95,26 @@ public class ZenModeVoiceActivity extends VoiceSettingsActivity { byMinute = R.plurals.zen_mode_summary_alarms_only_by_minute; byHour = R.plurals.zen_mode_summary_alarms_only_by_hour; break; - case Global.ZEN_MODE_NO_INTERRUPTIONS: - indefinite = R.string.zen_mode_summary_no_interruptions_indefinite; - byMinute = R.plurals.zen_mode_summary_no_interruptions_by_minute; - byHour = R.plurals.zen_mode_summary_no_interruptions_by_hour; - break; - case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS: - indefinite = R.string.zen_mode_summary_priority_indefinitely; - byMinute = R.plurals.zen_mode_summary_priority_by_minute; - byHour = R.plurals.zen_mode_summary_priority_by_hour; - break; - default: case Global.ZEN_MODE_OFF: indefinite = R.string.zen_mode_summary_always; break; }; - if (duration == null || duration.mCondition == null) { + if (minutes < 0 || mode == Global.ZEN_MODE_OFF) { return getString(indefinite); } - long time = System.currentTimeMillis() + duration.mMinutes * MINUTES_MS; + long time = System.currentTimeMillis() + minutes * MINUTES_MS; String skeleton = DateFormat.is24HourFormat(this, UserHandle.myUserId()) ? "Hm" : "hma"; String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton); CharSequence formattedTime = DateFormat.format(pattern, time); Resources res = getResources(); - if (duration.mMinutes < 60) { - return res.getQuantityString(byMinute, - duration.mMinutes, duration.mMinutes, formattedTime); + if (minutes < 60) { + return res.getQuantityString(byMinute, minutes, minutes, formattedTime); } else { - int hours = duration.mMinutes / 60; + int hours = minutes / 60; return res.getQuantityString(byHour, hours, hours, formattedTime); } } - - private ConditionSelection getConditionSelection(int minutes) { - Condition condition = ZenModeConfig.toTimeCondition(this, minutes, UserHandle.myUserId()); - Resources res = getResources(); - if (minutes <= 0) { - return null; - } else if (minutes < 60) { - String label = res.getQuantityString(R.plurals.zen_mode_duration_minutes_voice_label, - minutes, minutes); - return new ConditionSelection(condition, minutes, label, Integer.toString(minutes)); - } else { - int hours = minutes / 60; - String label = res.getQuantityString(R.plurals.zen_mode_duration_hours_voice_label, - hours, hours); - return new ConditionSelection(condition, minutes, label, Integer.toString(hours)); - } - } - - private static class ConditionSelection extends VoiceSelection { - Condition mCondition; - int mMinutes; - - public ConditionSelection(Condition condition, int minutes, CharSequence label, - CharSequence synonyms) { - super(label, synonyms); - mMinutes = minutes; - mCondition = condition; - } - } - - private static class ModeSelection extends VoiceSelection { - int mMode; - - public ModeSelection(Context context, int mode, int label, int synonyms) { - super(context.getString(label), context.getString(synonyms)); - mMode = mode; - } - } } diff --git a/src/com/android/settings/utils/VoiceSelection.java b/src/com/android/settings/utils/VoiceSelection.java deleted file mode 100644 index 997d2cc368d..00000000000 --- a/src/com/android/settings/utils/VoiceSelection.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2015 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.settings.utils; - -import android.app.VoiceInteractor.PickOptionRequest.Option; -import android.os.Bundle; -import android.text.TextUtils; - -/** - * Model for a single item that can be selected by a {@link VoiceSelectionFragment}. - * Each item consists of a visual label and several alternative synonyms for the item - * that can be used to identify the item by voice. - */ -public class VoiceSelection { - final CharSequence mLabel; - final CharSequence[] mSynonyms; - - /** - * Created a new selectable item with a visual label and a set of synonyms. - */ - public VoiceSelection(CharSequence label, CharSequence synonyms) { - mLabel = label; - mSynonyms = TextUtils.split(synonyms.toString(), ","); - } - - /** - * Created a new selectable item with a visual label and no synonyms. - */ - public VoiceSelection(CharSequence label) { - mLabel = label; - mSynonyms = null; - } - - public CharSequence getLabel() { - return mLabel; - } - - public CharSequence[] getSynonyms() { - return mSynonyms; - } - - Option toOption(int index) { - Option result = new Option(mLabel); - Bundle extras = new Bundle(); - extras.putInt("index", index); - result.setExtras(extras); - - for (CharSequence synonym : mSynonyms) { - result.addSynonym(synonym); - } - return result; - } - - /** - * Listener interface for when an item is selected. - */ - public interface OnItemSelectedListener { - abstract void onItemSelected(int position, VoiceSelection selection); - }; -} diff --git a/src/com/android/settings/utils/VoiceSelectionAdapter.java b/src/com/android/settings/utils/VoiceSelectionAdapter.java deleted file mode 100644 index 2c060c235fa..00000000000 --- a/src/com/android/settings/utils/VoiceSelectionAdapter.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2015 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.settings.utils; - -import android.content.Context; -import android.widget.ArrayAdapter; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import android.app.Activity; -import com.android.settings.R; - -import java.util.List; -import android.util.Log; - -/** - * Array adapter for selecting an item by voice interaction. Each row includes a visual - * indication of the 1-indexed position of the item so that a user can easily say - * "number 4" to select it. - */ -public class VoiceSelectionAdapter extends ArrayAdapter { - public VoiceSelectionAdapter(Context context, int resource, List objects) { - super(context, resource, objects); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - VoiceSelection item = getItem(position); - View row = convertView; - if (row == null) { - LayoutInflater inflater = ((Activity) getContext()).getLayoutInflater(); - row = inflater.inflate(R.layout.voice_item_row, parent, false); - } - - TextView label = (TextView) row.findViewById(R.id.voice_item_label); - if (label != null) { - label.setText(item.getLabel()); - } - - TextView positionLabel = (TextView) row.findViewById(R.id.voice_item_position); - if (positionLabel != null) { - positionLabel.setText(Integer.toString(position + 1)); - } - - return row; - } -}; diff --git a/src/com/android/settings/utils/VoiceSelectionFragment.java b/src/com/android/settings/utils/VoiceSelectionFragment.java deleted file mode 100644 index 1e4e7e407bd..00000000000 --- a/src/com/android/settings/utils/VoiceSelectionFragment.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (C) 2015 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.settings.utils; - -import android.app.ListFragment; -import android.app.VoiceInteractor; -import android.app.VoiceInteractor.PickOptionRequest; -import android.app.VoiceInteractor.PickOptionRequest.Option; -import android.os.Bundle; -import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.ListAdapter; -import android.widget.ListView; - -import java.util.List; - -/** - * An Activity fragment that presents a set of options as a visual list and also allows - * items to be selected by the users voice. - */ -public class VoiceSelectionFragment extends ListFragment { - private static final String EXTRA_SELECTION_PROMPT = "selection_prompt"; - - private CharSequence mPrompt = null; - private VoiceInteractor.Request mRequest = null; - private VoiceInteractor mVoiceInteractor = null; - private VoiceSelection.OnItemSelectedListener mOnItemSelectedListener = null; - - /** - * No-args ctor required for fragment. - */ - public VoiceSelectionFragment() {} - - @Override - public void onCreate(Bundle args) { - super.onCreate(args); - mPrompt = getArguments().getCharSequence(EXTRA_SELECTION_PROMPT); - } - - /** - * Set the prompt spoken when the fragment is presented. - */ - static public Bundle createArguments(CharSequence prompt) { - Bundle args = new Bundle(); - args.putCharSequence(EXTRA_SELECTION_PROMPT, prompt); - return args; - } - - private VoiceSelection getSelectionAt(int position) { - return ((ArrayAdapter) getListAdapter()).getItem(position); - } - - @Override - public void onStart() { - super.onStart(); - - final int numItems = getListAdapter().getCount(); - if (numItems <= 0) { - return; - } - - Option[] options = new Option[numItems]; - for (int idx = 0; idx < numItems; idx++) { - options[idx] = getSelectionAt(idx).toOption(idx); - } - mRequest = new PickOptionRequest(mPrompt, options, null) { - @Override - public void onPickOptionResult(boolean isComplete, Option[] options, Bundle args) { - if (!isComplete || options == null) { - return; - } - if (options.length == 1 && mOnItemSelectedListener != null) { - int idx = options[0].getExtras().getInt("index", -1); - mOnItemSelectedListener.onItemSelected(idx, getSelectionAt(idx)); - } else { - onCancel(); - } - } - }; - mVoiceInteractor = getActivity().getVoiceInteractor(); - if (mVoiceInteractor != null) { - mVoiceInteractor.submitRequest(mRequest); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mVoiceInteractor = null; - } - - @Override - public void onListItemClick(ListView l, View v, int position, long id) { - if (mRequest != null) { - mRequest.cancel(); - mRequest = null; - } - - if (mOnItemSelectedListener != null) { - mOnItemSelectedListener.onItemSelected(position, getSelectionAt(position)); - } - } - - - /** - * Sets the selection handler for an item either by voice or by touch. - */ - public void setOnItemSelectedHandler(VoiceSelection.OnItemSelectedListener listener) { - mOnItemSelectedListener = listener; - } - - /** - * Called when the user cancels the interaction. The default implementation is to - * finish the activity. - */ - public void onCancel() { - getActivity().finish(); - } -}; diff --git a/src/com/android/settings/utils/VoiceSettingsActivity.java b/src/com/android/settings/utils/VoiceSettingsActivity.java index 2553a547b07..e81c7e8a284 100644 --- a/src/com/android/settings/utils/VoiceSettingsActivity.java +++ b/src/com/android/settings/utils/VoiceSettingsActivity.java @@ -16,8 +16,6 @@ package com.android.settings.utils; -import com.android.settings.R; - import android.app.Activity; import android.app.Fragment; import android.app.VoiceInteractor; @@ -27,7 +25,6 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.TextView; -import android.widget.Toast; import android.util.Log; /** @@ -67,45 +64,17 @@ abstract public class VoiceSettingsActivity extends Activity { * not null, then it will be read to the user. */ protected void notifySuccess(CharSequence prompt) { - if (prompt != null) { - Toast.makeText(this, prompt, Toast.LENGTH_LONG).show(); - } - if (getVoiceInteractor() != null) { getVoiceInteractor().submitRequest(new CompleteVoiceRequest(prompt, null)); } } - protected void setHeader(String label) { - TextView header = (TextView) findViewById(R.id.voice_fragment_header); - if (header != null) { - if (label != null) { - header.setText(label); - header.setVisibility(View.VISIBLE); - } else { - header.setVisibility(View.GONE); - } - } - } - /** * Indicates when the setting could not be changed. */ protected void notifyFailure(CharSequence prompt) { - if (prompt != null) { - Toast.makeText(this, prompt, Toast.LENGTH_LONG).show(); - } - if (getVoiceInteractor() != null) { getVoiceInteractor().submitRequest(new AbortVoiceRequest(prompt, null)); } } - - protected void showFragment(Fragment fragment, String tag) { - getFragmentManager() - .beginTransaction() - .replace(R.id.voice_fragment_root, fragment, tag) - .commit(); - } - }