summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2013-09-28 01:09:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-28 01:09:14 +0000
commit1869da76131f2e1ed0f4b96eb81a95d3ecb056dd (patch)
treea99fa6a160774e3d4bb19e0c347c94288683d630 /res
parentb1b855b71e502459e1571444fb1a9f74883c8330 (diff)
parent9b025f2b2811902d678e6467d89de9f07e5cc61a (diff)
downloadandroid_packages_apps_UnifiedEmail-1869da76131f2e1ed0f4b96eb81a95d3ecb056dd.tar.gz
android_packages_apps_UnifiedEmail-1869da76131f2e1ed0f4b96eb81a95d3ecb056dd.tar.bz2
android_packages_apps_UnifiedEmail-1869da76131f2e1ed0f4b96eb81a95d3ecb056dd.zip
Merge "Print list of attachments." into jb-ub-mail-ur11
Diffstat (limited to 'res')
-rw-r--r--res/raw/template_border.html16
-rw-r--r--res/raw/template_conversation_lower.html16
-rw-r--r--res/raw/template_conversation_upper.html16
-rw-r--r--res/raw/template_message.html16
-rw-r--r--res/raw/template_print_conversation_lower.html16
-rw-r--r--res/raw/template_print_conversation_lower_no_js.html16
-rw-r--r--res/raw/template_print_conversation_upper.html2
-rw-r--r--res/raw/template_print_message.html16
-rw-r--r--res/raw/template_super_collapsed.html16
-rw-r--r--res/values/strings.xml5
10 files changed, 6 insertions, 129 deletions
diff --git a/res/raw/template_border.html b/res/raw/template_border.html
index 3669d5057..8478cbdee 100644
--- a/res/raw/template_border.html
+++ b/res/raw/template_border.html
@@ -1,17 +1 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
<div class="mail-border spacer" style="height: %spx;"></div>
diff --git a/res/raw/template_conversation_lower.html b/res/raw/template_conversation_lower.html
index 9b08dbaa3..9c18cf543 100644
--- a/res/raw/template_conversation_lower.html
+++ b/res/raw/template_conversation_lower.html
@@ -1,19 +1,3 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
<div id="initial-load-signal" class="%s"></div>
</body>
<script type="text/javascript">
diff --git a/res/raw/template_conversation_upper.html b/res/raw/template_conversation_upper.html
index fde89857b..fb693248b 100644
--- a/res/raw/template_conversation_upper.html
+++ b/res/raw/template_conversation_upper.html
@@ -1,19 +1,3 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
<!DOCTYPE html>
<html>
<head>
diff --git a/res/raw/template_message.html b/res/raw/template_message.html
index 8aa8e00e9..8195f7d01 100644
--- a/res/raw/template_message.html
+++ b/res/raw/template_message.html
@@ -1,19 +1,3 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
<div id="%s" class="mail-message %s">
<div class="mail-message-header spacer" style="height: %spx;"></div>
<div class="mail-message-content collapsible zoom-normal %s" style="display: %s; margin: 16px 0;">%s</div>
diff --git a/res/raw/template_print_conversation_lower.html b/res/raw/template_print_conversation_lower.html
index 6a8c6602c..bd6a12dce 100644
--- a/res/raw/template_print_conversation_lower.html
+++ b/res/raw/template_print_conversation_lower.html
@@ -1,19 +1,3 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
</div>
</div>
</body>
diff --git a/res/raw/template_print_conversation_lower_no_js.html b/res/raw/template_print_conversation_lower_no_js.html
index e6e704c72..e68930906 100644
--- a/res/raw/template_print_conversation_lower_no_js.html
+++ b/res/raw/template_print_conversation_lower_no_js.html
@@ -1,19 +1,3 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
</div>
</div>
</body>
diff --git a/res/raw/template_print_conversation_upper.html b/res/raw/template_print_conversation_upper.html
index 8660c8325..62e68bf91 100644
--- a/res/raw/template_print_conversation_upper.html
+++ b/res/raw/template_print_conversation_upper.html
@@ -65,7 +65,7 @@
<table width=100%% cellpadding=0 cellspacing=0 border=0>
<tr height=14px>
<td width=143>
- <img src="file:///android_res/drawable/logo"
+ <img src="file:///android_asset/images/ic_launcher_mail.png"
width=143 height=59 alt="%s">
</td>
<td align=right>
diff --git a/res/raw/template_print_message.html b/res/raw/template_print_message.html
index ded5075f7..5eb149c30 100644
--- a/res/raw/template_print_message.html
+++ b/res/raw/template_print_message.html
@@ -1,19 +1,3 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
<hr>
<table width=100%% cellpadding=0 cellspacing=0 border=0 class="message">
<tr>
diff --git a/res/raw/template_super_collapsed.html b/res/raw/template_super_collapsed.html
index 5ac9dacf8..386bbae33 100644
--- a/res/raw/template_super_collapsed.html
+++ b/res/raw/template_super_collapsed.html
@@ -1,17 +1 @@
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to 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.
--->
<div class="mail-super-collapsed-block spacer" index="%s" style="height: %spx;"></div>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 66d093af3..00063d836 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -955,5 +955,10 @@
<string name="draft_heading">Draft</string>
<!-- Shown to inform the user that the quoted text for this message has been hidden. [CHAR LIMIT=50] -->
<string name="quoted_text_hidden_print">Quoted text hidden</string>
+ <!-- Number of attachments in a message [CHAR LIMIT=30]-->
+ <plurals name="num_attachments">
+ <item quantity="one"><xliff:g id="count">%1$d</xliff:g> attachment</item>
+ <item quantity="other"><xliff:g id="count">%1$d</xliff:g> attachments</item>
+ </plurals>
</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 18:28:38 +0000