Fix http://b/2235284 by putting the next alarm in the Clock screen saver mode.

TBR.

10 files changed, 32 insertions, 9 deletions

diff --git a/res/drawable-hdpi/ic_lock_idle_alarm.png b/res/drawable-hdpi/ic_lock_idle_alarm.png
new file mode 100644
index 000000000..41ad27d46
--- /dev/null
+++ b/res/drawable-hdpi/ic_lock_idle_alarm.png
diff --git a/res/drawable-hdpi/ic_lock_idle_alarm_saver.png b/res/drawable-hdpi/ic_lock_idle_alarm_saver.png
new file mode 100644
index 000000000..72e28475b
--- /dev/null
+++ b/res/drawable-hdpi/ic_lock_idle_alarm_saver.png
diff --git a/res/drawable-hdpi/ic_lock_idle_alarm_saver_dim.png b/res/drawable-hdpi/ic_lock_idle_alarm_saver_dim.png
new file mode 100644
index 000000000..51a9ca74d
--- /dev/null
+++ b/res/drawable-hdpi/ic_lock_idle_alarm_saver_dim.png
diff --git a/res/drawable-mdpi/ic_lock_idle_alarm.png b/res/drawable-mdpi/ic_lock_idle_alarm.png
new file mode 100644
index 000000000..ee7752655
--- /dev/null
+++ b/res/drawable-mdpi/ic_lock_idle_alarm.png
diff --git a/res/drawable-mdpi/ic_lock_idle_alarm_saver.png b/res/drawable-mdpi/ic_lock_idle_alarm_saver.png
new file mode 100644
index 000000000..18f7515b7
--- /dev/null
+++ b/res/drawable-mdpi/ic_lock_idle_alarm_saver.png
diff --git a/res/drawable-mdpi/ic_lock_idle_alarm_saver_dim.png b/res/drawable-mdpi/ic_lock_idle_alarm_saver_dim.png
new file mode 100644
index 000000000..f6a0ab909
--- /dev/null
+++ b/res/drawable-mdpi/ic_lock_idle_alarm_saver_dim.png
diff --git a/res/layout-land/desk_clock.xml b/res/layout-land/desk_clock.xml
index 32ab78138..8e7ce88a7 100644
--- a/res/layout-land/desk_clock.xml
+++ b/res/layout-land/desk_clock.xml
@@ -58,7 +58,7 @@
                     android:textSize="18sp"
                     android:textColor="#FFFFFFFF"
                     android:drawablePadding="6dip"
-                    android:drawableLeft="@android:drawable/ic_lock_idle_alarm"
+                    android:drawableLeft="@drawable/ic_lock_idle_alarm"
                     android:shadowColor="#C0000000"
                     android:shadowDx="0"
                     android:shadowDy="0"
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index eced4f910..2246a2fab 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -60,7 +60,7 @@
                     android:textSize="18sp"
                     android:textColor="#FFFFFFFF"
                     android:drawablePadding="6dip"
-                    android:drawableLeft="@android:drawable/ic_lock_idle_alarm"
+                    android:drawableLeft="@drawable/ic_lock_idle_alarm"
                     android:shadowColor="#C0000000"
                     android:shadowDx="0"
                     android:shadowDy="0"
diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index 64d9e3d88..d34adfd07 100644
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -28,11 +28,27 @@
         android:background="#FF000000"
         />
 
-    <include layout="@layout/desk_clock_time_date"
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_x="0dip"
         android:layout_y="0dip"
-        />
+        android:id="@+id/saver_view"
+        >
+        <TextView android:id="@+id/nextAlarm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dip"
+            android:gravity="left"
+            android:textSize="18sp"
+            android:textColor="#FFFFFFFF"
+            android:drawablePadding="6dip"
+            />
+        <include layout="@layout/desk_clock_time_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/nextAlarm"
+            />
+    </RelativeLayout>
 
 </AbsoluteLayout>
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index c7164fb25..f8b71291a 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -211,14 +211,14 @@ public class DeskClock extends Activity {
     private void moveScreenSaverTo(int x, int y) {
         if (!mScreenSaverMode) return;
 
-        final View time_date = findViewById(R.id.time_date);
+        final View saver_view = findViewById(R.id.saver_view);
 
         DisplayMetrics metrics = new DisplayMetrics();
         getWindowManager().getDefaultDisplay().getMetrics(metrics);
 
         if (x < 0 || y < 0) {
-            int myWidth = time_date.getMeasuredWidth();
-            int myHeight = time_date.getMeasuredHeight();
+            int myWidth = saver_view.getMeasuredWidth();
+            int myHeight = saver_view.getMeasuredHeight();
             x = (int)(mRNG.nextFloat()*(metrics.widthPixels - myWidth));
             y = (int)(mRNG.nextFloat()*(metrics.heightPixels - myHeight));
         }
@@ -226,7 +226,7 @@ public class DeskClock extends Activity {
         if (DEBUG) Log.d(LOG_TAG, String.format("screen saver: %d: jumping to (%d,%d)",
                 System.currentTimeMillis(), x, y));
 
-        time_date.setLayoutParams(new AbsoluteLayout.LayoutParams(
+        saver_view.setLayoutParams(new AbsoluteLayout.LayoutParams(
             ViewGroup.LayoutParams.WRAP_CONTENT,
             ViewGroup.LayoutParams.WRAP_CONTENT,
             x,
@@ -285,15 +285,21 @@ public class DeskClock extends Activity {
 
         mTime = (DigitalClock) findViewById(R.id.time);
         mDate = (TextView) findViewById(R.id.date);
+        mNextAlarm = (TextView) findViewById(R.id.nextAlarm);
 
         final int color = mDimmed ? SCREEN_SAVER_COLOR_DIM : SCREEN_SAVER_COLOR;
 
         ((TextView)findViewById(R.id.timeDisplay)).setTextColor(color);
         ((TextView)findViewById(R.id.am_pm)).setTextColor(color);
         mDate.setTextColor(color);
+        mNextAlarm.setTextColor(color);
+        mNextAlarm.setCompoundDrawablesWithIntrinsicBounds(
+            getResources().getDrawable(mDimmed 
+                ? R.drawable.ic_lock_idle_alarm_saver_dim 
+                : R.drawable.ic_lock_idle_alarm_saver),
+            null, null, null);
 
         mBatteryDisplay =
-        mNextAlarm =
         mWeatherCurrentTemperature =
         mWeatherHighTemperature =
         mWeatherLowTemperature =
@@ -301,6 +307,7 @@ public class DeskClock extends Activity {
         mWeatherIcon = null;
 
         refreshDate();
+        refreshAlarm();
 
         moveScreenSaverTo(oldLoc[0], oldLoc[1]);
     }