Unbundle the DeskClock.

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

diff --git a/res/layout/alarm_alert.xml b/res/layout/alarm_alert.xml
index 5db840e..2e06010 100644 (file)
--- a/res/layout/alarm_alert.xml
+++ b/res/layout/alarm_alert.xml
@@ -16,8 +16,9 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -29,25 +30,42 @@
 
         <TextView android:id="@+id/alertTitle"
             style="?android:attr/textAppearanceLarge"
+            android:padding="5dip"
             android:singleLine="true"
             android:ellipsize="end"
             android:gravity="center"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
         <ImageView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1dip"
             android:scaleType="fitXY"
             android:gravity="fill_horizontal"
-            android:src="@*android:drawable/dialog_divider_horizontal_light"
+            android:src="@drawable/dialog_divider_horizontal_light"
             android:layout_marginLeft="10dip"
             android:layout_marginRight="10dip"/>
 
-        <LinearLayout
-            android:id="@+id/clockView"
-            android:layout_width="210dip"
-            android:layout_height="210dip"
-            android:gravity="center"/>
+        <com.android.deskclock.DigitalClock
+            style="@style/clock"
+            android:paddingTop="30dip"
+            android:paddingBottom="30dip"
+            android:baselineAligned="true"
+            android:gravity="center_horizontal">
+
+            <TextView android:id="@+id/timeDisplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="64sp"
+                android:textColor="?android:attr/textColorPrimary"/>
+
+            <TextView android:id="@+id/am_pm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"/>
+
+        </com.android.deskclock.DigitalClock>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -77,15 +95,6 @@
 
         </LinearLayout>
 
-        <TextView android:id="@+id/silencedText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:visibility="gone"
-            android:gravity="center"
-            android:textColor="@color/red"/>
-
     </LinearLayout>
+
 </LinearLayout>