Moving things around a little in the new DeskClock.

[android-x86/packages-apps-DeskClock.git] / res / layout / alarm_time.xml

diff --git a/res/layout/alarm_time.xml b/res/layout/alarm_time.xml
index c454d8a..6541804 100644 (file)
--- a/res/layout/alarm_time.xml
+++ b/res/layout/alarm_time.xml
@@ -16,22 +16,21 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingLeft="5dip"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
 
     <!-- A layout that displays the time.  Shows time, am/pm (if 12-hour),
          and an optional line below, used for day/days of week -->
 
-    <com.android.alarmclock.DigitalClock android:id="@+id/digitalClock"
+    <com.android.deskclock.DigitalClock android:id="@+id/digitalClock"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:focusable="true"
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:background="@android:drawable/menuitem_background">
+        android:paddingLeft="8dip"
+        android:paddingRight="8dip">
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -40,55 +39,54 @@
             <TextView android:id="@+id/timeDisplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="-4dp"
-                android:paddingBottom="-4dp"
-                android:textSize="28sp"
+                android:textSize="30sp"
                 android:textColor="@color/white"/>
 
             <LinearLayout android:id="@+id/am_pm"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
+                android:layout_height="fill_parent"
+                android:layout_marginLeft="4dip"
                 android:orientation="vertical">
 
                 <TextView android:id="@+id/am"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="3dp"
+                    android:layout_height="fill_parent"
+                    android:gravity="bottom"
+                    android:layout_weight=".5"
+                    android:includeFontPadding="false"
                     android:textSize="12sp"/>
+
                 <TextView android:id="@+id/pm"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="-4dp"
+                    android:layout_height="fill_parent"
+                    android:gravity="top"
+                    android:layout_weight=".5"
+                    android:includeFontPadding="false"
                     android:textSize="12sp"/>
-            </LinearLayout>
-
-            <TextView android:id="@+id/label"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/default_label"
-                android:paddingTop="-4dp"
-                android:paddingBottom="-4dp"
-                android:textSize="28sp"
-                android:textColor="@color/white"
-                android:layout_marginLeft="20dp"
-                android:singleLine="true"/>
 
+            </LinearLayout>
         </LinearLayout>
 
         <TextView android:id="@+id/daysOfWeek"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textSize="10sp"
+            android:textColor="@color/ltgrey"/>
+
+        <TextView android:id="@+id/label"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
             android:textColor="@color/ltgrey"
-            android:layout_marginLeft="2dp"
-            android:visibility="gone"/>
+            android:textStyle="bold|italic"
+            android:singleLine="true"/>
 
-    </com.android.alarmclock.DigitalClock>
+    </com.android.deskclock.DigitalClock>
 
     <CheckBox android:id="@+id/alarmButton"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:focusable="false"
+        android:layout_width="60dip"
+        android:layout_height="76dip"
         android:layout_gravity="center_vertical"/>
 
 </LinearLayout>