Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/apps/Calendar into upstream-2.3.5cm-7.1.0gingerbread-release

Conflicts:
	res/values-zh-rTW/strings.xml

Change-Id: I058f9e3e30c23d2b8ca3c064b9e8e9cbeae29848

7 files changed, 38 insertions, 30 deletions

diff --git a/res/values-mcc262/strings.xml b/res/values-mcc262/strings.xml
new file mode 100644
index 00000000..b7071a15
--- /dev/null
+++ b/res/values-mcc262/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- DO NOT TRANSLATE the domain to use for auto-completing email addresses-->
+    <string name="google_email_domain">googlemail.com</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7ed4fab8..b102aaff 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -140,7 +140,7 @@
     <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Bruk egen tidssone"</string>
     <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Viser kalender- og aktivitetstidspunkter i din egen tidssone når du er på reise"</string>
     <string name="preferences_home_tz_title" msgid="6680000444088818578">"Egen tidssone"</string>
-    <string name="preferences_about_title" msgid="2810624892412097879">"Om"</string>
+    <string name="preferences_about_title" msgid="2810624892412097879">"Info"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Delversjon"</string>
   <string-array name="prefEntries_alerts_vibrateWhen">
     <item msgid="2539376794936035639">"Alltid"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ecc3b7ce..c54307e6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -137,9 +137,9 @@
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Время напоминания"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Напомнить"</string>
     <string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
-    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Домашний пояс"</string>
-    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Для календаря и мероприятий всегда задается домашнее время"</string>
-    <string name="preferences_home_tz_title" msgid="6680000444088818578">"Домашний часовой пояс"</string>
+    <string name="preferences_use_home_tz_title" msgid="5597546849968598210">"Фикс. часовой пояс"</string>
+    <string name="preferences_use_home_tz_descrip" msgid="4835375381297413746">"Всегда показывать в календаре время в заданном часовом поясе"</string>
+    <string name="preferences_home_tz_title" msgid="6680000444088818578">"Мой часовой пояс"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"О программе"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версия сборки"</string>
   <string-array name="prefEntries_alerts_vibrateWhen">
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3c929226..7d94ccad 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -410,25 +410,10 @@
 
     <!-- The vibrate notification modes -->
     <string-array name="prefEntries_alerts_vibrateWhen">
-        <!-- Always -->
-        <item msgid="2539376794936035639">"永遠要"</item>
-        <!-- Only when the phone is in Silent mode -->
-        <item msgid="8091719131860840185">"靜音時才啟用"</item>
-        <!-- Never -->
-        <item msgid="4552962311897985633">"永遠不要"</item>
+      <item msgid="2539376794936035639">"一律"</item>
+      <item msgid="8091719131860840185">"靜音時才啟用"</item>
+      <item msgid="4552962311897985633">"永遠不要"</item>
     </string-array>
-
-    <!-- The default vibrateWhen value, when none is set -->
-    <!-- skipping untranslatable /resources:0/string:name=prefDefault_alerts_vibrateWhen -->
-    <!-- The value to use then migrating from old versions for a true vibrate setting -->
-    <!-- skipping untranslatable /resources:0/string:name=prefDefault_alerts_vibrate_true -->
-    <!-- The value to use then migrating from old versions for a false vibrate setting -->
-    <!-- skipping untranslatable /resources:0/string:name=prefDefault_alerts_vibrate_false -->
-
-    <!-- The vibrateWhen values -->
-    <!-- skipping untranslatable /resources:0/string-array:name=prefValues_alerts_vibrateWhen -->
-
-    <!-- Dialog title for the Vibrate dialog -->
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"震動"</string>
+  <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"震動"</string>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e27fbb8d..8932b396 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -237,6 +237,8 @@
     <string name="content_description_edit_event_reminders">Reminders</string>
     <!-- The content description for the widget for removing a reminder from an event. [CHAR LIMIT=NONE] -->
     <string name="content_description_edit_event_remove_reminder">Remove reminder</string>
+<!-- DO NOT TRANSLATE the domain to use for auto-completing email addresses-->
+    <string name="google_email_domain">gmail.com</string>
 
     <!-- View Event -->
     <skip />
diff --git a/src/com/android/calendar/AlertService.java b/src/com/android/calendar/AlertService.java
index 7bac553f..70f135fa 100644
--- a/src/com/android/calendar/AlertService.java
+++ b/src/com/android/calendar/AlertService.java
@@ -177,9 +177,13 @@ public class AlertService extends Service {
                 //     newState = CalendarAlerts.DISMISSED;
                 // } else
 
-                // Remove declined events and duplicate alerts for the same event
-                if (!declined && eventIds.put(eventId, beginTime) == null) {
-                    numReminders++;
+                // Remove declined events
+                if (!declined) {
+                    // Don't count duplicate alerts for the same event
+                    if (eventIds.put(eventId, beginTime) == null) {
+                        numReminders++;
+                    }
+
                     if (state == CalendarAlerts.SCHEDULED) {
                         newState = CalendarAlerts.FIRED;
                         numFired++;
@@ -191,9 +195,6 @@ public class AlertService extends Service {
                     }
                 } else {
                     newState = CalendarAlerts.DISMISSED;
-                    if (DEBUG) {
-                        if (!declined) Log.d(TAG, "dropping dup alert for event " + eventId);
-                    }
                 }
 
                 // Update row if state changed
diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index 7013d9e2..5af14bde 100644
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -661,7 +661,7 @@ public class EditEvent extends Activity implements View.OnClickListener,
         long begin = intent.getLongExtra(EVENT_BEGIN_TIME, 0);
         long end = intent.getLongExtra(EVENT_END_TIME, 0);
 
-        String domain = "gmail.com";
+        String domain = getResources().getString(R.string.google_email_domain);
 
         boolean allDay = false;
         if (mEventCursor != null) {