Merge "New dream settings - first cut" into jb-mr1-dev

10 files changed, 119 insertions, 58 deletions

diff --git a/res/drawable-hdpi/dream_info_bg_pressed.9.png b/res/drawable-hdpi/dream_info_bg_pressed.9.png
new file mode 100644
index 0000000..6193822
--- /dev/null
+++ b/res/drawable-hdpi/dream_info_bg_pressed.9.png
diff --git a/res/drawable-hdpi/dream_info_bg_unpressed.9.png b/res/drawable-hdpi/dream_info_bg_unpressed.9.png
new file mode 100644
index 0000000..6ebed8b
--- /dev/null
+++ b/res/drawable-hdpi/dream_info_bg_unpressed.9.png
diff --git a/res/drawable-mdpi/dream_info_bg_pressed.9.png b/res/drawable-mdpi/dream_info_bg_pressed.9.png
new file mode 100644
index 0000000..62d8622
--- /dev/null
+++ b/res/drawable-mdpi/dream_info_bg_pressed.9.png
diff --git a/res/drawable-mdpi/dream_info_bg_unpressed.9.png b/res/drawable-mdpi/dream_info_bg_unpressed.9.png
new file mode 100644
index 0000000..aa239b3
--- /dev/null
+++ b/res/drawable-mdpi/dream_info_bg_unpressed.9.png
diff --git a/res/drawable-xhdpi/dream_info_bg_pressed.9.png b/res/drawable-xhdpi/dream_info_bg_pressed.9.png
new file mode 100644
index 0000000..5c4da74
--- /dev/null
+++ b/res/drawable-xhdpi/dream_info_bg_pressed.9.png
diff --git a/res/drawable-xhdpi/dream_info_bg_upressed.9.png b/res/drawable-xhdpi/dream_info_bg_upressed.9.png
new file mode 100644
index 0000000..bdf477b
--- /dev/null
+++ b/res/drawable-xhdpi/dream_info_bg_upressed.9.png
diff --git a/res/drawable/dream_info_bg.xml b/res/drawable/dream_info_bg.xml
new file mode 100644
index 0000000..7930170
--- /dev/null
+++ b/res/drawable/dream_info_bg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/dream_info_bg_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/dream_info_bg_unpressed" android:state_pressed="false"/>
+
+</selector>
\ No newline at end of file
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
new file mode 100644
index 0000000..64c2653
--- /dev/null
+++ b/res/layout/dream_info_row.xml
@@ -0,0 +1,82 @@
+<!--
+     Copyright (C) 2012 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/dream_info_bg"
+    android:orientation="vertical" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@android:dimen/app_icon_size"
+            android:layout_height="@android:dimen/app_icon_size"
+            android:layout_centerVertical="true"
+            android:layout_margin="8dp"
+            android:contentDescription="@null"
+            android:scaleType="fitCenter" />
+
+        <RadioButton
+            android:id="@android:id/button1"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_margin="8dp"
+            android:duplicateParentState="true" />
+
+        <TextView
+            android:id="@android:id/text1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@android:id/button1"
+            android:layout_toRightOf="@android:id/icon"
+            android:ellipsize="end"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <Button
+                android:id="@android:id/button2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/screensaver_settings_dream_settings" />
+
+            <Button
+                android:id="@android:id/button3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/screensaver_settings_dream_preview" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
deleted file mode 100644
index b445cf4..0000000
--- a/res/layout/dream_picker_row.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, 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.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="2dip"
-    android:gravity="center_vertical">
-
-    <ImageView android:id="@+id/icon"
-        android:layout_width="@android:dimen/app_icon_size"
-        android:layout_height="@android:dimen/app_icon_size"
-        android:scaleType="fitCenter"
-        android:contentDescription="@null" />
-
-    <TextView android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:paddingStart="6dip" />
-        
-</LinearLayout>
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 73b760b..74c72e5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1702,29 +1702,25 @@
     <!-- Display settings screen, trigger for screen saver options -->
     <string name="screensaver_settings_title">Dream</string>
     <!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked -->
-    <string name="screensaver_settings_summary_both">When docked or asleep and charging</string>
+    <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
+    <!-- Dream settings screen, dialog option, activated on sleep or docked -->
+    <string name="screensaver_settings_summary_either_short">Either</string>
     <!-- Display settings screen, summary fragment for screen saver options, activated on sleep -->
-    <string name="screensaver_settings_summary_sleep">When asleep and charging</string>
+    <string name="screensaver_settings_summary_sleep">While asleep and charging</string>
     <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
-    <string name="screensaver_settings_summary_dock">When docked</string>
+    <string name="screensaver_settings_summary_dock">While docked</string>
     <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
     <string name="screensaver_settings_summary_off">Disabled</string>
-    <!-- Screen saver settings, setting option name to select a module -->
-    <string name="screensaver_component_title">Selected dream</string>
-    <!-- Screen saver settings, setting option name to change activation timeout -->
-    <string name="screensaver_timeout_title">When to activate</string>
-    <!-- Screen saver settings, setting option summary to change activation timeout -->
-    <string name="screensaver_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string>
-    <!-- Screen saver settings, setting option summary to change activation timeout, shown when disabled -->
-    <string name="screensaver_timeout_zero_summary">Never</string>
-    <!-- Screen saver settings, button allowing the user to test/try the current module -->
-    <string name="screensaver_test">Try it!</string>
-    <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
-         the device sleeps -->
-    <string name="screensaver_activate_on_sleep_title">Start on sleep</string>
-    <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
-         the device is docked -->
-    <string name="screensaver_activate_on_dock_title">Start when docked</string>
+    <!-- Dream settings screen, caption for when dreams are disabled -->
+    <string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn Dreams on.</string>
+    <!-- Dream settings screen, action label, start dreaming -->
+    <string name="screensaver_settings_start_dreaming">Start dreaming now</string>
+    <!-- Dream settings screen, action label, when to dream -->
+    <string name="screensaver_settings_when_to_dream">When to dream</string>
+    <!-- Dream settings screen, button label to launch dream settings -->
+    <string name="screensaver_settings_dream_settings">Settings</string>
+    <!-- Dream settings screen, button label to preview dream -->
+    <string name="screensaver_settings_dream_preview">Preview</string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->