summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-11-16 17:13:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-16 17:13:16 -0800
commit5311917df5fe9804105ff6070346b8fac4b102df (patch)
tree4061554f4b4f0673ef60464911ef9a8ff9c0f37d /packages
parent69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3 (diff)
parent589f3624e0aa0d2b58d3461d1330b8da135d1729 (diff)
downloadframeworks_base-5311917df5fe9804105ff6070346b8fac4b102df.zip
frameworks_base-5311917df5fe9804105ff6070346b8fac4b102df.tar.gz
frameworks_base-5311917df5fe9804105ff6070346b8fac4b102df.tar.bz2
Merge "Remove day of week from phone notification panel." into ics-mr1
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/res/values-sw600dp/donottranslate.xml27
-rw-r--r--packages/SystemUI/res/values/donottranslate.xml2
2 files changed, 28 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values-sw600dp/donottranslate.xml b/packages/SystemUI/res/values-sw600dp/donottranslate.xml
new file mode 100644
index 0000000..0996067
--- /dev/null
+++ b/packages/SystemUI/res/values-sw600dp/donottranslate.xml
@@ -0,0 +1,27 @@
+<?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">
+ <!-- For formatting day of week and date in DateView. %1$s is DOW, %2$s is date.
+ We show both (DOW on one line, then the date) but this can be overridden for locales as
+ necessary.
+ -->
+ <string name="status_bar_date_formatter">%1$s\n%2$s</string>
+
+</resources>
+
diff --git a/packages/SystemUI/res/values/donottranslate.xml b/packages/SystemUI/res/values/donottranslate.xml
index 089a54d..4ca2116 100644
--- a/packages/SystemUI/res/values/donottranslate.xml
+++ b/packages/SystemUI/res/values/donottranslate.xml
@@ -21,6 +21,6 @@
We show both (DOW on one line, then the date) but this can be overridden for locales as
necessary.
-->
- <string name="status_bar_date_formatter">%1$s\n%2$s</string>
+ <string name="status_bar_date_formatter">%2$s</string>
</resources>