Merge change Iabe6771c into eclair

* changes:
  Import revised translations.  DO NOT MERGE

diff --git a/res/drawable-hdpi/ic_lock_idle_alarm.png b/res/drawable-hdpi/ic_lock_idle_alarm.png
index 41ad27d..6b4f66d 100644 (file)
Binary files a/res/drawable-hdpi/ic_lock_idle_alarm.png and b/res/drawable-hdpi/ic_lock_idle_alarm.png differ

diff --git a/res/drawable-hdpi/ic_lock_idle_alarm_saver.png b/res/drawable-hdpi/ic_lock_idle_alarm_saver.png
index 72e2847..fbc98d8 100644 (file)
Binary files a/res/drawable-hdpi/ic_lock_idle_alarm_saver.png and b/res/drawable-hdpi/ic_lock_idle_alarm_saver.png differ

diff --git a/res/drawable-mdpi/ic_lock_idle_alarm.png b/res/drawable-mdpi/ic_lock_idle_alarm.png
index ee77526..d29c6c3 100644 (file)
Binary files a/res/drawable-mdpi/ic_lock_idle_alarm.png and b/res/drawable-mdpi/ic_lock_idle_alarm.png differ

diff --git a/res/drawable-mdpi/ic_lock_idle_alarm_saver.png b/res/drawable-mdpi/ic_lock_idle_alarm_saver.png
index 18f7515..a1815df 100644 (file)
Binary files a/res/drawable-mdpi/ic_lock_idle_alarm_saver.png and b/res/drawable-mdpi/ic_lock_idle_alarm_saver.png differ

diff --git a/res/layout-land/desk_clock.xml b/res/layout-land/desk_clock.xml
index c956195..0cbaccf 100644 (file)
--- a/res/layout-land/desk_clock.xml
+++ b/res/layout-land/desk_clock.xml
@@ -25,20 +25,23 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical"
-        android:paddingTop="18dip"
+        android:paddingTop="25dip"
         >
 
         <!-- Entire display region (everything but bottom buttons) -->
+        <!-- Left margin is 4 dip shy of desired to allow for the time to
+             "hang off" the left-hand side, accommodating the extra glyph
+             escapement in Clockopia and 3px of text shadow -->
         <LinearLayout
             android:orientation="vertical"
             android:layout_gravity="left"
             android:layout_weight="1"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_marginLeft="20dip"
-            android:layout_marginTop="20dip"
-            android:layout_marginRight="20dip"
-            android:layout_marginBottom="14dip"
+            android:layout_marginLeft="25dip"
+            android:layout_marginTop="18dip"
+            android:layout_marginRight="18dip"
+            android:layout_marginBottom="12dip"
             >
 
             <!-- across the top: next alarm, battery, nightmode button -->
@@ -48,6 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
                 android:layout_marginBottom="6dip"
+                android:layout_marginLeft="4dip"
                 android:gravity="center_vertical"
                 >
                 <TextView android:id="@+id/nextAlarm"
@@ -88,7 +92,6 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:gravity="bottom"
-                android:layout_marginBottom="12dip"
                 >
 
                 <include layout="@layout/desk_clock_time_date"

diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index 7ffd1d2..271dc65 100644 (file)
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -23,24 +23,28 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
+    <!-- the top padding accounts for the status bar area -->
     <LinearLayout
         android:id="@+id/desk_clock"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical"
-        android:paddingTop="18dip"
+        android:paddingTop="25dip"
         >
 
         <!-- Entire display region (everything but bottom buttons) -->
+        <!-- Left margin is 4 dip shy of desired to allow for the time to
+             "hang off" the left-hand side, accommodating the extra glyph
+             escapement in Clockopia and 3px of text shadow -->
         <LinearLayout
             android:orientation="vertical"
             android:layout_gravity="left"
             android:layout_weight="1"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_marginLeft="20dip"
-            android:layout_marginTop="20dip"
-            android:layout_marginRight="14dip"
+            android:layout_marginLeft="22dip"
+            android:layout_marginTop="18dip"
+            android:layout_marginRight="18dip"
             android:layout_marginBottom="14dip"
             >
 
@@ -50,14 +54,16 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
+                android:layout_marginLeft="4dip"
                 android:layout_marginBottom="6dip"
+                android:gravity="center_vertical"
                 >
                 <TextView android:id="@+id/nextAlarm"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="left"
-                                       android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:drawablePadding="6dip"
                     android:drawableLeft="@drawable/ic_lock_idle_alarm"
                     android:shadowColor="#C0000000"
@@ -66,7 +72,7 @@
                     android:shadowRadius="3.0"                        
                     />
                 <ImageButton android:id="@+id/nightmode_button"
-                                       style="@style/RoundTouchButton"
+                    style="@style/RoundTouchButton"
                     android:layout_weight="0"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -86,13 +92,15 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
                 android:layout_marginTop="12dip"
-                android:layout_marginBottom="12dip"
+                android:layout_marginBottom="40dip"
+                android:layout_marginLeft="4dip"
                 />
 
             <include layout="@layout/desk_clock_battery"
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent"
                 android:layout_weight="0"
+                android:layout_marginLeft="4dip"
                 />
 
         </LinearLayout>

diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index 9450661..fcde362 100644 (file)
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -39,8 +39,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dip"
+            android:layout_marginLeft="4dip"
             android:gravity="left"
-                       android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:drawablePadding="6dip"
             />
         <include layout="@layout/desk_clock_time_date"

diff --git a/res/layout/desk_clock_time_date.xml b/res/layout/desk_clock_time_date.xml
index 2c14595..5b2af22 100644 (file)
--- a/res/layout/desk_clock_time_date.xml
+++ b/res/layout/desk_clock_time_date.xml
@@ -54,7 +54,7 @@
             android:textStyle="bold"
             android:singleLine="true"
             android:ellipsize="none"
-            android:layout_marginLeft="3dip"
+            android:layout_marginLeft="4dip"
             android:shadowColor="#C0000000"
             android:shadowDx="0"
             android:shadowDy="0"
@@ -72,6 +72,7 @@
         android:shadowDx="0"
         android:shadowDy="0"
         android:shadowRadius="3.0"
+        android:layout_marginLeft="4dip"
         />
 
 </LinearLayout>

diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 625f03f..fb7ce00 100644 (file)
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -100,7 +100,7 @@ public class DeskClock extends Activity {
     private final long QUERY_WEATHER_DELAY = 5 * 60 * 1000; // 5 min
 
     // Delay before engaging the burn-in protection mode (green-on-black).
-    private final long SCREEN_SAVER_TIMEOUT = 10 * 60 * 1000; // 10 min
+    private final long SCREEN_SAVER_TIMEOUT = 5* 60 * 1000; // 10 min
 
     // Repositioning delay in screen saver.
     private final long SCREEN_SAVER_MOVE_DELAY = 60 * 1000; // 1 min