diff options
author | John Spurlock <jspurlock@google.com> | 2015-04-09 12:50:04 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2015-04-09 20:56:16 -0400 |
commit | 45fa140b8c6846b4546fdeabebf989ae9102cebb (patch) | |
tree | ddebdae6ced30e4be858c4381c7c029e132dfa4a /res/menu | |
parent | 342d08537fe316f0d046a3a3097c294e4b30e912 (diff) | |
download | packages_apps_Settings-45fa140b8c6846b4546fdeabebf989ae9102cebb.zip packages_apps_Settings-45fa140b8c6846b4546fdeabebf989ae9102cebb.tar.gz packages_apps_Settings-45fa140b8c6846b4546fdeabebf989ae9102cebb.tar.bz2 |
Settings: An update on Downtime.
- Migrate settings to the new zen mode state model.
- Remove downtime settings.
- Add automatic rule management page (add/remove)
- Bind new automatic schedule rules to detail editor.
- Clean up a few found miscapitalized string captions.
- Migrate zen switch to report the shared summary string.
Bug: 20064962
Change-Id: Ia561e7f77c90c962729240b4d51ba1915297f64a
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/zen_mode_automation.xml | 24 | ||||
-rw-r--r-- | res/menu/zen_mode_rule.xml | 24 |
2 files changed, 48 insertions, 0 deletions
diff --git a/res/menu/zen_mode_automation.xml b/res/menu/zen_mode_automation.xml new file mode 100644 index 0000000..02ec41f --- /dev/null +++ b/res/menu/zen_mode_automation.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/add" + android:title="@string/zen_mode_time_add_rule" + android:icon="@drawable/ic_menu_add_white" + android:visible="true" + android:showAsAction="collapseActionView|ifRoom" /> +</menu> diff --git a/res/menu/zen_mode_rule.xml b/res/menu/zen_mode_rule.xml new file mode 100644 index 0000000..eea30a8 --- /dev/null +++ b/res/menu/zen_mode_rule.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/delete" + android:title="@string/zen_mode_delete_rule" + android:icon="@drawable/ic_delete" + android:visible="true" + android:showAsAction="collapseActionView|ifRoom" /> +</menu> |