New UI for the list of alarms.

[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..24a485b 100644 (file)
--- a/res/layout/alarm_time.xml
+++ b/res/layout/alarm_time.xml
@@ -16,79 +16,93 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingTop="4dip"
+    android:paddingBottom="4dip"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <LinearLayout android:id="@+id/indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="14dip"
+        android:paddingRight="14dip"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip"
+        android:orientation="vertical">
+        <CheckBox android:id="@+id/clock_onoff"
+            android:focusable="false"
+            android:background="@drawable/indicator_clock_onoff"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center"
+            android:button="@null"/>
+        <ImageView android:id="@+id/bar_onoff"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:paddingTop="4dip"
+            android:src="@drawable/ic_indicator_off" />
+    </LinearLayout>
+
+    <ImageView
+        android:src="@*android:drawable/divider_vertical_dark"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:scaleType="fitXY"
+        android:gravity="fill_vertical" />
 
     <!-- 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:layout_weight="1"
         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"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:baselineAligned="true">
 
             <TextView android:id="@+id/timeDisplay"
+                android:includeFontPadding="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="-4dp"
-                android:paddingBottom="-4dp"
-                android:textSize="28sp"
+                android:paddingRight="6dip"
+                android:textSize="36sp"
                 android:textColor="@color/white"/>
 
-            <LinearLayout android:id="@+id/am_pm"
+            <TextView android:id="@+id/am_pm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:orientation="vertical">
-
-                <TextView android:id="@+id/am"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="3dp"
-                    android:textSize="12sp"/>
-                <TextView android:id="@+id/pm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="-4dp"
-                    android:textSize="12sp"/>
-            </LinearLayout>
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/white"/>
 
             <TextView android:id="@+id/label"
-                android:layout_width="fill_parent"
+                android:layout_width="wrap_content"
                 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:layout_weight="1"
+                android:textSize="16sp"
+                android:textColor="@color/grey"
+                android:textStyle="bold"
+                android:gravity="right"
+                android:paddingRight="8dip"
                 android:singleLine="true"/>
 
         </LinearLayout>
 
         <TextView android:id="@+id/daysOfWeek"
+            android:includeFontPadding="false"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textSize="10sp"
-            android:textColor="@color/ltgrey"
-            android:layout_marginLeft="2dp"
-            android:visibility="gone"/>
-
-    </com.android.alarmclock.DigitalClock>
+            android:textColor="@color/grey"/>
 
-    <CheckBox android:id="@+id/alarmButton"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_gravity="center_vertical"/>
+    </com.android.deskclock.DigitalClock>
 
 </LinearLayout>