diff options
| author | Michael Chan <mchan@android.com> | 2011-06-14 18:02:37 -0700 |
|---|---|---|
| committer | android-merger <android-build@android.com> | 2011-06-24 11:20:07 -0700 |
| commit | ee794988e54a2e8172b1482d108924934c0f70cb (patch) | |
| tree | 2a0b2b252eb256ed7f3a1a6b2c9e39f9f261652d | |
| parent | 4fbc294c129025fa238cc0aef4e08c6d6d3d98c2 (diff) | |
| download | Calendar-gingerbread-release.tar.gz | |
b/4560383 pick googlemail.com by default in germany. DO NOT MERGEandroid-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1gingerbread-releasegingerbread-mr4-release
Change-Id: I64ab42f5f2c3d85e9f71b0e2e5feaedf53801b69
| -rw-r--r-- | res/values-mcc262/strings.xml | 20 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/calendar/EditEvent.java | 2 |
3 files changed, 23 insertions, 1 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/strings.xml b/res/values/strings.xml index 59dbbc78..9a7f2b7e 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/EditEvent.java b/src/com/android/calendar/EditEvent.java index 43d99a37..59343a01 100644 --- a/src/com/android/calendar/EditEvent.java +++ b/src/com/android/calendar/EditEvent.java @@ -657,7 +657,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) { |