Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
packages_apps_Calendar
Commits
783921ab
Commit
783921ab
authored
13 years ago
by
Michael Chan
Browse files
Options
Download
Email Patches
Plain Diff
b/4560383 pick googlemail.com by default in germany. DO NOT MERGE
Change-Id: I64ab42f5f2c3d85e9f71b0e2e5feaedf53801b69
parent
ed7fa72c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletion
+23
-1
res/values-mcc262/strings.xml
res/values-mcc262/strings.xml
+20
-0
res/values/strings.xml
res/values/strings.xml
+2
-0
src/com/android/calendar/EditEvent.java
src/com/android/calendar/EditEvent.java
+1
-1
No files found.
res/values-mcc262/strings.xml
0 → 100644
View file @
783921ab
<?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
This diff is collapsed.
Click to expand it.
res/values/strings.xml
View file @
783921ab
...
...
@@ -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
/>
...
...
This diff is collapsed.
Click to expand it.
src/com/android/calendar/EditEvent.java
View file @
783921ab
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment