summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-03-05 18:31:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-03-05 18:31:38 +0000
commit67491373a7f8d710a04bdb69edfe07cd8dcb5eba (patch)
tree08a728ee595835b3ffeeae598e21be40c50900e9
parent206b3ad719fee722c7d874ba0e9b74f1623b8323 (diff)
parentc29a6191ca7fe25b470bb981fae02c138b1a2597 (diff)
Merge "Work around unintentionally translated String resource crashing SystemUI."
-rw-r--r--packages/SystemUI/res/values/donottranslate.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res/values/donottranslate.xml b/packages/SystemUI/res/values/donottranslate.xml
index 38f469e6eda3..67293c57e344 100644
--- a/packages/SystemUI/res/values/donottranslate.xml
+++ b/packages/SystemUI/res/values/donottranslate.xml
@@ -18,8 +18,8 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Date format for display: should match the lockscreen in /policy. -->
- <string name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</string>
+ <string name="system_ui_date_pattern" translatable="false">@*android:string/system_ui_date_pattern</string>
<!-- Date format for the always on display. -->
- <item type="string" name="system_ui_aod_date_pattern">eeeMMMd</item>
+ <item type="string" name="system_ui_aod_date_pattern" translatable="false">eeeMMMd</item>
</resources>