merge from eclair

AndroidManifest.xml

@@ -6,13 +6,16 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application android:label="@string/app_label"
                  android:icon="@drawable/ic_launcher_alarmclock">
 
         <provider android:name="AlarmProvider" android:authorities="com.android.alarmclock" />
 
-        <activity android:name="AlarmClock" android:label="@string/app_label">
+        <activity android:name="AlarmClock" android:label="@string/app_label"
+                android:icon="@drawable/ic_widget_analog_clock"
+                android:configChanges="orientation|keyboardHidden|keyboard|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -26,35 +29,48 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="SetAlarm" android:label="@string/set_alarm" />
+        <activity android:name="SetAlarm" android:label="@string/set_alarm"
+                android:configChanges="orientation|keyboardHidden|keyboard|navigation" />
 
         <activity android:name="AlarmAlert"
                 android:excludeFromRecents="true"
                 android:theme="@style/alarm_alert"
-                android:launchMode="singleTask"
-                android:taskAffinity=":AlarmAlert"
-                android:screenOrientation="portrait"
+                android:launchMode="singleInstance"
+                android:taskAffinity=""
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation"/>
 
         <!-- This activity is basically the same as AlarmAlert but with a more
              generic theme. It also shows as full screen (with status bar) but
              with the wallpaper background. -->
         <activity android:name="AlarmAlertFullScreen"
                 android:excludeFromRecents="true"
-                android:theme="@android:style/Theme.NoTitleBar"
-                android:launchMode="singleTask"
-                android:taskAffinity=":AlarmAlert"
-                android:screenOrientation="portrait"
+                android:theme="@android:style/Theme.Wallpaper.NoTitleBar"
+                android:launchMode="singleInstance"
+                android:taskAffinity=""
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation"/>
 
         <activity android:name="ClockPicker" />
 
         <receiver android:name="AlarmReceiver">
             <intent-filter>
                <action android:name="com.android.alarmclock.ALARM_ALERT" />
+               <action android:name="alarm_killed" />
+               <action android:name="cancel_snooze" />
             </intent-filter>
         </receiver>
 
+        <!-- This service receives the same intent as AlarmReceiver but it does
+             not respond to the same broadcast. The AlarmReceiver will receive
+             the alert broadcast and will start this service with the same
+             intent. The service plays the alarm alert and vibrates the device.
+             This allows the alert to continue playing even if another activity
+             causes the AlarmAlert activity to pause. -->
+        <service android:name="AlarmKlaxon">
+            <intent-filter>
+                <action android:name="com.android.alarmclock.ALARM_ALERT" />
+            </intent-filter>
+        </service>
+
         <receiver android:name="AlarmInitReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -63,7 +79,8 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name="AnalogAppWidgetProvider" android:label="@string/analog_gadget">
+        <receiver android:name="AnalogAppWidgetProvider" android:label="@string/analog_gadget"
+        	android:icon="@drawable/ic_widget_analog_clock">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>

res/drawable/animate_circle.xml

@@ -17,10 +17,10 @@
 <!--  Chewie... the hyperdrive ain't working -->
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:oneshot="false" android:visible="true">
-    <item android:drawable="@drawable/circle0" android:duration="80" />
-    <item android:drawable="@drawable/circle1" android:duration="80" />
-    <item android:drawable="@drawable/circle2" android:duration="80" />
-    <item android:drawable="@drawable/circle3" android:duration="80" />
+    <item android:drawable="@drawable/circle0_drawable" android:duration="80" />
+    <item android:drawable="@drawable/circle1_drawable" android:duration="80" />
+    <item android:drawable="@drawable/circle2_drawable" android:duration="80" />
+    <item android:drawable="@drawable/circle3_drawable" android:duration="80" />
 </animation-list>
 
 

res/drawable/circle0_drawable.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false" android:src="@drawable/circle0"
+    android:gravity="center"/>

res/drawable/circle1_drawable.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false" android:src="@drawable/circle1"
+    android:gravity="center"/>

res/drawable/circle2_drawable.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false" android:src="@drawable/circle2"
+    android:gravity="center"/>

res/drawable/circle3_drawable.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false" android:src="@drawable/circle3"
+    android:gravity="center"/>

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="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -45,9 +46,10 @@
 
         <LinearLayout
             android:id="@+id/clockView"
-            android:layout_width="210dip"
-            android:layout_height="210dip"
-            android:gravity="center"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="fill_vertical|center"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -77,15 +79,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>

res/layout/alarm_time.xml

@@ -16,6 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingLeft="5dip"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
 
@@ -25,13 +26,11 @@
     <com.android.alarmclock.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>
 
     <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>

res/layout/context_menu_header.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="6dip"
+    android:paddingBottom="9dip"
+    android:paddingLeft="10dip"
+    android:paddingRight="10dip">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:paddingTop="6dip"
+        android:paddingRight="10dip"
+        android:src="@*android:drawable/ic_dialog_time"/>
+
+    <TextView android:id="@+id/header_time"
+        style="?android:attr/textAppearanceLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:singleLine="true"
+        android:gravity="center_vertical"
+        android:ellipsize="none"/>
+
+    <TextView android:id="@+id/header_label"
+        style="?android:attr/textAppearanceLarge"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="20dip"
+        android:singleLine="true"
+        android:gravity="right|center_vertical"
+        android:ellipsize="end"/>
+
+</LinearLayout>
+