From 6b74f6f5a6d47fe80ce92c44444aebd3436937b2 Mon Sep 17 00:00:00 2001
From: Patrick Scott <phanna@android.com>
Date: Tue, 15 Sep 2009 08:00:09 -0400
Subject: [PATCH] Revert the AlarmAlert to a rotatable activity.

Remove the orientation from the manifest. Edit the alarm_alert.xml layout to be
more accommodating to landscape. Add circle#_drawable.xml files that are
BitmapDrawables for the circle animation. This prevents the background animation
from being stretched to the view size.
---
 AndroidManifest.xml               |  2 --
 res/drawable/animate_circle.xml   |  8 ++++----
 res/drawable/circle0_drawable.xml | 18 ++++++++++++++++++
 res/drawable/circle1_drawable.xml | 18 ++++++++++++++++++
 res/drawable/circle2_drawable.xml | 18 ++++++++++++++++++
 res/drawable/circle3_drawable.xml | 18 ++++++++++++++++++
 res/layout/alarm_alert.xml        | 12 +++++++-----
 7 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100644 res/drawable/circle0_drawable.xml
 create mode 100644 res/drawable/circle1_drawable.xml
 create mode 100644 res/drawable/circle2_drawable.xml
 create mode 100644 res/drawable/circle3_drawable.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d541f3f..8e88bcd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -35,7 +35,6 @@
                 android:theme="@style/alarm_alert"
                 android:launchMode="singleTask"
                 android:taskAffinity=":AlarmAlert"
-                android:screenOrientation="portrait"
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation"/>
 
         <!-- This activity is basically the same as AlarmAlert but with a more
@@ -46,7 +45,6 @@
                 android:theme="@android:style/Theme.NoTitleBar"
                 android:launchMode="singleTask"
                 android:taskAffinity=":AlarmAlert"
-                android:screenOrientation="portrait"
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation"/>
 
         <activity android:name="ClockPicker" />
diff --git a/res/drawable/animate_circle.xml b/res/drawable/animate_circle.xml
index 02dfd51..a07b8cf 100644
--- a/res/drawable/animate_circle.xml
+++ b/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>
 
 
diff --git a/res/drawable/circle0_drawable.xml b/res/drawable/circle0_drawable.xml
new file mode 100644
index 0000000..0137d4a
--- /dev/null
+++ b/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"/>
diff --git a/res/drawable/circle1_drawable.xml b/res/drawable/circle1_drawable.xml
new file mode 100644
index 0000000..1272c4b
--- /dev/null
+++ b/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"/>
diff --git a/res/drawable/circle2_drawable.xml b/res/drawable/circle2_drawable.xml
new file mode 100644
index 0000000..d1b492d
--- /dev/null
+++ b/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"/>
diff --git a/res/drawable/circle3_drawable.xml b/res/drawable/circle3_drawable.xml
new file mode 100644
index 0000000..1060a32
--- /dev/null
+++ b/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"/>
diff --git a/res/layout/alarm_alert.xml b/res/layout/alarm_alert.xml
index 9964c08..1b5c2c4 100644
--- 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="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"
-- 
2.11.0