Merge "Zen mode configuration panel. (packages/apps/Settings)"

6 files changed, 31 insertions, 1 deletions

diff --git a/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 000000000..267e7bac6
--- /dev/null
+++ b/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png
diff --git a/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 000000000..db51f6b6b
--- /dev/null
+++ b/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png
diff --git a/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 000000000..8d22ce233
--- /dev/null
+++ b/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png
diff --git a/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 000000000..29fb50f82
--- /dev/null
+++ b/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png
diff --git a/res/layout/preference_zen_mode.xml b/res/layout/preference_zen_mode.xml
new file mode 100644
index 000000000..4139d401f
--- /dev/null
+++ b/res/layout/preference_zen_mode.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/configure_zen_mode"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:padding="8dip"
+    android:visibility="gone"
+    android:background="?android:attr/selectableItemBackground"
+    android:src="@drawable/ic_bt_config"
+    android:contentDescription="@string/configure_zen_mode_description" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 43fd71980..56f7ddf7e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5012,6 +5012,10 @@
     <string name="title_zen_mode">Zen mode</string>
     <!-- [CHAR LIMIT=30] Sound settings screen, setting option summary displaying the currently selected zen mode -->
     <string name="summary_zen_mode" translatable="false">%1$s</string>
-    <!-- [CHAR LIMIT=40] Sound  settings screen, title of dialog for picking zen mode -->
+    <!-- [CHAR LIMIT=40] Sound settings screen, title of dialog for picking zen mode -->
     <string name="dialog_title_zen_mode">Zen mode</string>
+    <!-- [CHAR LIMIT=30] Sound settings screen, description for configuring zen mode -->
+    <string name="configure_zen_mode_description">Configure Zen mode</string>
+    <!-- [CHAR LIMIT=30] Zen mode settings screen, activity title -->
+    <string name="zen_mode_settings_title">Limited Interruptions</string>
 </resources>