auto import from //depot/cupcake/@136594

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9363849..7a3a6d3 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,7 +52,7 @@
         <activity android:name="DayActivity" android:label="@string/day_view"
             android:theme="@android:style/Theme.Light.NoTitleBar" />
         <activity android:name="AgendaActivity" android:label="@string/agenda_view" 
-            android:theme="@android:style/Theme.Light.NoTitleBar"
+            android:theme="@android:style/Theme.Light"
             android:exported="true" />
         
         <activity android:name="EditEvent" android:label="@string/event_edit_title"
@@ -67,7 +67,7 @@
         </activity>
         
         <activity android:name="EventInfoActivity" android:label="@string/event_info_title"
-               android:theme="@android:style/Theme.Light"
+            android:theme="@android:style/Theme.Light.NoTitleBar"
             android:configChanges="orientation|keyboardHidden">
             
             <intent-filter>
@@ -79,7 +79,7 @@
         <activity android:name="SelectCalendarsActivity" android:label="@string/calendars_title" />
         <activity android:name="CalendarPreferenceActivity" android:label="@string/preferences_title" />
         <activity android:name="AlertActivity" android:launchMode="singleInstance"
-             android:theme="@style/Alert" android:excludeFromRecents="true" />
+             android:theme="@android:style/Theme.Light" android:excludeFromRecents="true" />
         <receiver android:name="AlertReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.EVENT_REMINDER" />

diff --git a/res/layout/agenda_day.xml b/res/layout/agenda_day.xml
index faee4a6..5332a44 100644 (file)
--- a/res/layout/agenda_day.xml
+++ b/res/layout/agenda_day.xml
@@ -19,7 +19,7 @@
     android:orientation="horizontal"
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
-    android:background="@android:color/darker_gray"
+    android:background="@color/agenda_day_bar_color"
     android:padding="4dip"
     >
     <TextView android:id="@+id/date"

diff --git a/res/layout/agenda_item.xml b/res/layout/agenda_item.xml
index e700328..052b037 100644 (file)
--- a/res/layout/agenda_item.xml
+++ b/res/layout/agenda_item.xml
@@ -4,9 +4,9 @@
      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.
@@ -19,47 +19,49 @@
     android:id="@android:id/content"
     android:layout_height="wrap_content"
     android:layout_width="fill_parent">
-    
-       <LinearLayout
-           android:orientation="horizontal"
-           android:layout_height="wrap_content"
-           android:layout_width="fill_parent"
-           >
-           
-           <View android:id="@+id/vertical_stripe"
-               android:layout_width="10dip"
-               android:layout_height="fill_parent"
-               android:layout_marginRight="5dip" />
-               
-           <LinearLayout
-               android:orientation="vertical"
-               android:layout_height="wrap_content"
-               android:layout_width="fill_parent"
-               android:layout_weight="1">
-               
-               <TextView android:id="@+id/title"
-                   android:layout_width="fill_parent"
-                   android:layout_height="wrap_content"
-                   android:textStyle="bold"
-                   android:textColor="@android:color/black"
-                   style="?android:attr/textAppearanceMediumInverse"
-               />
-               
-               <TextView android:id="@+id/when"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:textStyle="bold"
-                   android:textColor="@android:color/black"
-                   style="?android:attr/textAppearanceSmallInverse"
-               />
-                       
-               <TextView android:id="@+id/where"
-                   android:layout_width="fill_parent"
-                   android:layout_height="wrap_content"
-                   android:textStyle="bold"
-                   android:textColor="@android:color/black"
-                   style="?android:attr/textAppearanceSmallInverse"
-               />
-           </LinearLayout>
-       </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        >
+
+        <View android:id="@+id/vertical_stripe"
+            android:layout_width="10dip"
+            android:layout_height="fill_parent"
+            android:layout_marginRight="5dip" />
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_weight="1">
+
+            <TextView android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                style="?android:attr/textAppearanceMediumInverse"
+            />
+
+            <TextView android:id="@+id/when"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                style="?android:attr/textAppearanceSmallInverse"
+            />
+
+            <TextView android:id="@+id/where"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                style="?android:attr/textAppearanceSmallInverse"
+            />
+        </LinearLayout>
+    </LinearLayout>
+</FrameLayout>

diff --git a/res/layout/alert_activity.xml b/res/layout/alert_activity.xml
index bce77d1..31d6cde 100644 (file)
--- a/res/layout/alert_activity.xml
+++ b/res/layout/alert_activity.xml
@@ -17,34 +17,27 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="10dip">
-    
+    android:layout_height="fill_parent">
+
     <ListView android:id="@+id/alert_container"
         android:layout_width="fill_parent"
         android:layout_height="0dip"
-        android:layout_weight="1"
-        android:listSelector="@android:color/transparent"
-        android:divider="@null" />
+        android:layout_weight="1"/>
     
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="3dip">
+        style="@android:style/ButtonBar">
 
         <Button android:id="@+id/snooze_all"
-            android:layout_width="wrap_content"
+            android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/snooze_all_label" />
 
-        <TextView android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-            
         <Button android:id="@+id/dismiss_all"
-            android:layout_width="wrap_content"
+            android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/dismiss_all_label" />

diff --git a/res/layout/alert_item.xml b/res/layout/alert_item.xml
index 9e76405..057289c 100644 (file)
--- a/res/layout/alert_item.xml
+++ b/res/layout/alert_item.xml
@@ -18,34 +18,26 @@
     android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/box_appointment">
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight">
     
-    <ImageView android:id="@+id/vertical_stripe"
-        android:layout_width="wrap_content"
+    <View android:id="@+id/vertical_stripe"
+        android:layout_width="10dip"
         android:layout_height="fill_parent"
-        android:layout_marginTop="2dip"
-        android:layout_marginBottom="2dip"
-        android:layout_marginRight="5dip"
-        android:background="@drawable/box_color_white" />
+        android:layout_marginRight="5dip" />
         
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
         
-        <LinearLayout android:id="@+id/event_title_container"
-            android:orientation="horizontal"
+        <TextView android:id="@+id/event_title"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-            
-            <TextView android:id="@+id/event_title"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:textStyle="bold"
-                android:textColor="@android:color/black"
-                style="?android:attr/textAppearanceMediumInverse" />
-        </LinearLayout>
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textStyle="bold"
+            android:textColor="@android:color/black"
+            style="?android:attr/textAppearanceMediumInverse" />
         
         <LinearLayout android:id="@+id/event_details"
             android:orientation="vertical"
@@ -68,8 +60,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:textStyle="bold"
-                        style="?android:attr/textAppearanceSmallInverse" />
-                        
+                        style="?android:attr/textAppearanceSmall" />
+
                     <ImageView android:id="@+id/repeat_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
@@ -91,7 +83,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textStyle="bold"
-                style="?android:attr/textAppearanceSmallInverse" />
+                style="?android:attr/textAppearanceSmall" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>

diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index f6e58b6..f7d5eb3 100644 (file)
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 dny"</item>
     <item>"1 týden"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Žádné"</item>
     <item>"5 minut"</item>
@@ -64,33 +48,11 @@
     <item>"2 dny"</item>
     <item>"1 týden"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Upozornění"</item>
     <item>"Oznámení ve stavovém řádku"</item>
     <item>"Vypnuto"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Nedostupný"</item>
     <item>"Dostupný"</item>

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 35d3d63..cf00f49 100644 (file)
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 Tage"</item>
     <item>"1 Woche"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Keine"</item>
     <item>"5 Minuten"</item>
@@ -64,33 +48,11 @@
     <item>"2 Tage"</item>
     <item>"1 Woche"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Benachrichtigung"</item>
     <item>"Statuszeilenbenachrichtigung"</item>
     <item>"Aus"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Beschäftigt"</item>
     <item>"Verfügbar"</item>

diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 133a831..ac59e24 100644 (file)
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 días"</item>
     <item>"1 semana"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Ninguno"</item>
     <item>"5 minutos"</item>
@@ -64,33 +48,11 @@
     <item>"2 días"</item>
     <item>"1 semana"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Alertar"</item>
     <item>"Notificación de la barra de estado"</item>
     <item>"Desconectado"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Ocupado"</item>
     <item>"Disponible"</item>

diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 62e0448..afb9346 100644 (file)
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 jours"</item>
     <item>"1 semaine"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Aucun"</item>
     <item>"5 minutes"</item>
@@ -64,33 +48,11 @@
     <item>"2 jours"</item>
     <item>"1 semaine"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Alerte"</item>
     <item>"Notification de barre d\'état"</item>
     <item>"Désactivé"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Occupé"</item>
     <item>"Disponible"</item>

diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 5778f7e..66fd63a 100644 (file)
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 giorni"</item>
     <item>"1 settimana"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Nessuno"</item>
     <item>"5 minuti"</item>
@@ -64,33 +48,11 @@
     <item>"2 giorni"</item>
     <item>"1 settimana"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Avviso"</item>
     <item>"Notifica barra di stato"</item>
     <item>"Disativa"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Occupato"</item>
     <item>"Disponibile"</item>

diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 8c05d85..e6963a4 100644 (file)
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2日"</item>
     <item>"1週間"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1,440"</item>
-    <item>"2,880"</item>
-    <item>"10,080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"なし"</item>
     <item>"5分"</item>
@@ -64,33 +48,11 @@
     <item>"2日"</item>
     <item>"1週間"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1,440"</item>
-    <item>"2,880"</item>
-    <item>"10,080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"アラート"</item>
     <item>"ステータスバーの通知"</item>
     <item>"オフ"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"予定あり"</item>
     <item>"予定なし"</item>

diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 926bfdc..d7924ce 100644 (file)
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2일"</item>
     <item>"1주"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"없음"</item>
     <item>"5분"</item>
@@ -64,33 +48,11 @@
     <item>"2일"</item>
     <item>"1주"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"알림"</item>
     <item>"상태 표시줄 알림"</item>
     <item>"해제"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"다른 용무 중"</item>
     <item>"대화가능"</item>

diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 0155043..97179c0 100644 (file)
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 dager"</item>
     <item>"1 uke"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Ingen"</item>
     <item>"5 minutter"</item>
@@ -64,33 +48,11 @@
     <item>"2 dager"</item>
     <item>"1 uke"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Advarsel"</item>
     <item>"Varsling i statusfeltet"</item>
     <item>"Av"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Opptatt"</item>
     <item>"Tilgjengelig"</item>

diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 2ee530f..fdb58dd 100644 (file)
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 dagen"</item>
     <item>"1 week"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Geen"</item>
     <item>"5 minuten"</item>
@@ -64,33 +48,11 @@
     <item>"2 dagen"</item>
     <item>"1 week"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Melding"</item>
     <item>"Statusbalkmelding"</item>
     <item>"Uit"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Bezet"</item>
     <item>"Beschikbaar"</item>

diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index d81349d..b0e278a 100644 (file)
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 dni"</item>
     <item>"1 tydzień"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Brak"</item>
     <item>"5 min"</item>
@@ -64,33 +48,11 @@
     <item>"2 dni"</item>
     <item>"1 tydzień"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Alert"</item>
     <item>"Powiadomienie na pasku stanu"</item>
     <item>"Wyłączone"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Zajęty"</item>
     <item>"Dostępny"</item>

diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 21c026c..23c2ae8 100644 (file)
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 дня"</item>
     <item>"1 неделя"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"Нет"</item>
     <item>"5 минут"</item>
@@ -64,33 +48,11 @@
     <item>"2 дня"</item>
     <item>"1 неделя"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"Оповещение"</item>
     <item>"Уведомление в строке состояния"</item>
     <item>"Выкл"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"Занято"</item>
     <item>"Свободно"</item>

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 8470d4e..10d1c23 100644 (file)
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 天"</item>
     <item>"1 周"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"无"</item>
     <item>"5 分钟"</item>
@@ -64,33 +48,11 @@
     <item>"2 天"</item>
     <item>"1 周"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"提醒"</item>
     <item>"状态栏通知"</item>
     <item>"关闭"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"忙碌"</item>
     <item>"有空"</item>

diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 2138eef..08e4230 100644 (file)
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -31,22 +31,6 @@
     <item>"2 天"</item>
     <item>"1 週"</item>
   </string-array>
-  <string-array name="reminder_minutes_values">
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_default_reminder_labels">
     <item>"無"</item>
     <item>"5 分鐘"</item>
@@ -64,33 +48,11 @@
     <item>"2 天"</item>
     <item>"1 週"</item>
   </string-array>
-  <string-array name="preferences_default_reminder_values">
-    <item>"0"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"20"</item>
-    <item>"25"</item>
-    <item>"30"</item>
-    <item>"45"</item>
-    <item>"60"</item>
-    <item>"120"</item>
-    <item>"180"</item>
-    <item>"720"</item>
-    <item>"1440"</item>
-    <item>"2880"</item>
-    <item>"10080"</item>
-  </string-array>
   <string-array name="preferences_alert_type_labels">
     <item>"警示"</item>
     <item>"狀態列通知"</item>
     <item>"關閉"</item>
   </string-array>
-  <string-array name="preferences_alert_type_values">
-    <item>"0"</item>
-    <item>"1"</item>
-    <item>"2"</item>
-  </string-array>
   <string-array name="availability">
     <item>"忙碌"</item>
     <item>"有空"</item>

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ccdfe78..16a9cab 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -35,7 +35,7 @@
         <item>1 week</item>
     </string-array>
     
-    <string-array name="reminder_minutes_values">
+    <string-array name="reminder_minutes_values" translatable="false">
         <item>"5"</item>
         <item>"10"</item>
         <item>"15"</item>
@@ -70,7 +70,7 @@
         <item>1 week</item>
     </string-array>
     
-    <string-array name="preferences_default_reminder_values">
+    <string-array name="preferences_default_reminder_values" translatable="false">
         <item>"0"</item>
         <item>"5"</item>
         <item>"10"</item>
@@ -94,7 +94,7 @@
         <item>Off</item>
     </string-array>
     
-    <string-array name="preferences_alert_type_values">
+    <string-array name="preferences_alert_type_values" translatable="false">
         <item>"0"</item>
         <item>"1"</item>
         <item>"2"</item>

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 32cfc28..11cfeba 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,7 +37,7 @@
     <color name="calendar_grid_area_background">#ffffffff</color>
     <color name="calendar_grid_area_selected">#ffffffcc</color>
     <color name="calendar_grid_line_horizontal_color">#ffdddddd</color>
-    <color name="calendar_grid_line_vertical_color">#ff5a5a5a</color>
+    <color name="calendar_grid_line_vertical_color">#ff808080</color>
     <color name="calendar_grid_line_highlight_color">#ff707070</color>
     <color name="selection">#ffffaa00</color>
     <color name="pressed">#fffab400</color>
@@ -50,7 +50,9 @@
     <color name="month_week_banner">#20595959</color>
 
     <color name="event_center">#ff6bd697</color>
-    
+
+    <color name="agenda_day_bar_color">#c8c8c8</color>
+
     <drawable name="agenda_item_declined">#88ffffff</drawable>
 </resources>
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8ee9a03..0e26905 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -158,6 +158,8 @@
 
     <!-- The alert toast is not actually being displayed for some reason. -->
     <skip />
+    <!-- the title of the alert/notification activity -->
+    <string name="alert_title">Calendar notifications</string>
     <!-- The label for the date/time of an event in a popup window -->
     <string name="alert_when_label">When:</string>
     <!-- The label for the location of an event in a popup window -->

diff --git a/src/com/android/calendar/AgendaActivity.java b/src/com/android/calendar/AgendaActivity.java
index fd159e6..cf4c6b6 100644 (file)
--- a/src/com/android/calendar/AgendaActivity.java
+++ b/src/com/android/calendar/AgendaActivity.java
@@ -206,7 +206,6 @@ public class AgendaActivity extends Activity implements ViewSwitcher.ViewFactory
         // TODO: We should restore the old heap size once the activity reaches the idle state
         long oldHeapSize = VMRuntime.getRuntime().setMinimumHeapSize(INITIAL_HEAP_SIZE);
 
-        getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.agenda_activity);
 
         mContentResolver = getContentResolver();
@@ -220,7 +219,7 @@ public class AgendaActivity extends Activity implements ViewSwitcher.ViewFactory
         } else {
             mTime.set(Utils.timeFromIntent(getIntent()));
         }
-        setTitle(Utils.formatMonthYear(mTime));
+        setTitle(R.string.agenda_view);
 
         mViewSwitcher = (ViewSwitcher) findViewById(R.id.switcher);
         mViewSwitcher.setFactory(this);

diff --git a/src/com/android/calendar/AlertActivity.java b/src/com/android/calendar/AlertActivity.java
index 913bd85..b5b34ef 100644 (file)
--- a/src/com/android/calendar/AlertActivity.java
+++ b/src/com/android/calendar/AlertActivity.java
@@ -147,8 +147,8 @@ public class AlertActivity extends Activity {
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.alert_activity);
+        setTitle(R.string.alert_title);
         
         WindowManager.LayoutParams lp = getWindow().getAttributes();
         lp.width = ViewGroup.LayoutParams.FILL_PARENT;

diff --git a/src/com/android/calendar/AlertAdapter.java b/src/com/android/calendar/AlertAdapter.java
index b182ccd..d9fac2d 100644 (file)
--- a/src/com/android/calendar/AlertAdapter.java
+++ b/src/com/android/calendar/AlertAdapter.java
@@ -19,11 +19,9 @@ package com.android.calendar;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
-import android.graphics.PorterDuff;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.ResourceCursorAdapter;
 import android.widget.TextView;
 
@@ -36,11 +34,13 @@ public class AlertAdapter extends ResourceCursorAdapter {
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
         TextView textView;
-        
-        ImageView stripe = (ImageView) view.findViewById(R.id.vertical_stripe);
-        int color = cursor.getInt(AlertActivity.INDEX_COLOR) & 0xbbffffff;
-        stripe.getBackground().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-        
+
+        View stripe = view.findViewById(R.id.vertical_stripe);
+        int color = cursor.getInt(AlertActivity.INDEX_COLOR);
+        stripe.setBackgroundColor(color);
+        textView = (TextView) view.findViewById(R.id.event_title);
+        textView.setTextColor(color);
+
         // Repeating info
         View repeatContainer = view.findViewById(R.id.repeat_icon);
         String rrule = cursor.getString(AlertActivity.INDEX_RRULE);

diff --git a/src/com/android/calendar/CalendarActivity.java b/src/com/android/calendar/CalendarActivity.java
index 639d59c..f691648 100644 (file)
--- a/src/com/android/calendar/CalendarActivity.java
+++ b/src/com/android/calendar/CalendarActivity.java
@@ -37,6 +37,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
+import android.view.animation.TranslateAnimation;
 import android.widget.ProgressBar;
 import android.widget.ViewSwitcher;
 
@@ -46,6 +47,7 @@ import android.widget.ViewSwitcher;
 public class CalendarActivity extends Activity implements Navigator {
 
     private static final long INITIAL_HEAP_SIZE = 4*1024*1024;
+    private static final long ANIMATION_DURATION = 400;
 
     protected static final String BUNDLE_KEY_RESTORE_TIME = "key_restore_time";
 
@@ -254,28 +256,43 @@ public class CalendarActivity extends Activity implements Navigator {
     }
 
     public View switchViews(boolean forward, float xOffSet, float width) {
-        long offset = 0;
-        if (xOffSet != 0) {
-
-            // The user might have scrolled the view to the left or right
-            // in which case we just want to animate the bit left over
-            // instead of animating all of it. So calculate how much
-            // it's been moved already and animate the remaining portion
-            double progress = ((width - (Math.abs(xOffSet))) / width);
-            long duration = mInAnimationForward.getDuration();
-            offset = -1 * (long) (duration - (duration * progress));
-        }
+        float progress = Math.abs(xOffSet) / width;
+        
+        float inFromXValue, inToXValue;
+        float outFromXValue, outToXValue;
         if (forward) {
-            mInAnimationForward.setStartOffset(offset);
-            mOutAnimationForward.setStartOffset(offset);
-            mViewSwitcher.setInAnimation(mInAnimationForward);
-            mViewSwitcher.setOutAnimation(mOutAnimationForward);
+            inFromXValue = 1.0f - progress;
+            inToXValue = 0.0f;
+            outFromXValue = -progress;
+            outToXValue = -1.0f;
         } else {
-            mInAnimationBackward.setStartOffset(offset);
-            mOutAnimationBackward.setStartOffset(offset);
-            mViewSwitcher.setInAnimation(mInAnimationBackward);
-            mViewSwitcher.setOutAnimation(mOutAnimationBackward);
+            inFromXValue = progress - 1.0f;
+            inToXValue = 0.0f;
+            outFromXValue = progress;
+            outToXValue = 1.0f;
         }
+        
+        // We have to allocate these animation objects each time we switch views
+        // because that is the only way to set the animation parameters.
+        TranslateAnimation inAnimation = new TranslateAnimation(
+                Animation.RELATIVE_TO_SELF, inFromXValue,
+                Animation.RELATIVE_TO_SELF, inToXValue,
+                Animation.ABSOLUTE, 0.0f,
+                Animation.ABSOLUTE, 0.0f);
+
+        TranslateAnimation outAnimation = new TranslateAnimation(
+                Animation.RELATIVE_TO_SELF, outFromXValue,
+                Animation.RELATIVE_TO_SELF, outToXValue,
+                Animation.ABSOLUTE, 0.0f,
+                Animation.ABSOLUTE, 0.0f);
+        
+        // Reduce the animation duration based on how far we have already swiped.
+        long duration = (long) (ANIMATION_DURATION * (1.0f - progress));
+        inAnimation.setDuration(duration);
+        outAnimation.setDuration(duration);
+        mViewSwitcher.setInAnimation(inAnimation);
+        mViewSwitcher.setOutAnimation(outAnimation);
+        
         CalendarView view = (CalendarView) mViewSwitcher.getCurrentView();
         view.cleanup();
         mViewSwitcher.showNext();

diff --git a/src/com/android/calendar/CalendarView.java b/src/com/android/calendar/CalendarView.java
index a50c44b..43fe93b 100644 (file)
--- a/src/com/android/calendar/CalendarView.java
+++ b/src/com/android/calendar/CalendarView.java
@@ -1168,6 +1168,7 @@ public class CalendarView extends View
         dest.bottom = mViewHeight;
         dest.left = 0;
         dest.right = mViewWidth;
+
         canvas.save();
         canvas.clipRect(dest);
         canvas.drawColor(0, PorterDuff.Mode.CLEAR);
@@ -2422,6 +2423,8 @@ public class CalendarView extends View
                 if (Math.abs(mViewStartX) > HORIZONTAL_SCROLL_THRESHOLD) {
                     // The user has gone beyond the threshold so switch views
                     mParentActivity.switchViews(mViewStartX > 0, mViewStartX, mViewWidth);
+                    mViewStartX = 0;
+                    return true;
                 } else {
                     // Not beyond the threshold so invalidate which will cause
                     // the view to snap back.  Also call recalc() to ensure
@@ -2429,8 +2432,8 @@ public class CalendarView extends View
                     recalc();
                     mTitleTextView.setText(mDateRange);
                     invalidate();
+                    mViewStartX = 0;
                 }
-                mViewStartX = 0;
             }
 
             // If we were scrolling, then reset the selected hour so that it
@@ -2947,6 +2950,10 @@ public class CalendarView extends View
         if (handler != null) {
             handler.removeCallbacks(mDismissPopup);
         }
+        
+        // Turn off redraw
+        mRemeasure = false;
+        mRedrawScreen = false;
     }
 
     @Override protected void onDetachedFromWindow() {