Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark 'candidates_style' as not translatable

Browse Source 
BUG: 29940650
Change-Id: Ic867076339d3aac5db4be35c9b6296c6361a0303
This commit is contained in:
Mark Renouf
2016-09-01 16:33:23 -04:00
parent 57bd22ffc1
commit 292c86dac9
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/res/res/values-watch/donottranslate.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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>
<!-- DO NOT TRANSLATE Spans within this text are applied to style composing regions
within an EditText widget. The text content is ignored and not used.
Note: This is @color/material_deep_teal_200, cannot use @color references here. -->
<string name="candidates_style" translatable="false"><font color="#80cbc4">candidates</font></string>
</resources>

5
core/res/res/values-watch/styles_material.xml
View File

@@ -88,9 +88,4 @@ please see styles_device_defaults.xml.
<item name="virtualButtonPressedDrawable">?selectableItemBackground</item> <item name="virtualButtonPressedDrawable">?selectableItemBackground</item>
<item name="descendantFocusability">blocksDescendants</item> <item name="descendantFocusability">blocksDescendants</item>
</style> </style>
<!-- DO NOTE TRANSLATE Spans within this text are applied to style composing regions
within an EditText widget. The text content is ignored and not used.
Note: This is @color/material_deep_teal_200, cannot use @color references here. -->
<string name="candidates_style"><font color="#80cbc4">candidates</font></string>
</resources> </resources>

3
core/res/res/values/donottranslate.xml
View File

@@ -26,4 +26,7 @@
<string name="icu_abbrev_wday_month_day_no_year">eeeMMMMd</string> <string name="icu_abbrev_wday_month_day_no_year">eeeMMMMd</string>
<!-- @hide DO NOT TRANSLATE. date formatting pattern for system ui.--> <!-- @hide DO NOT TRANSLATE. date formatting pattern for system ui.-->
<string name="system_ui_date_pattern">@string/icu_abbrev_wday_month_day_no_year</string> <string name="system_ui_date_pattern">@string/icu_abbrev_wday_month_day_no_year</string>
<!-- @hide DO NOT TRANSLATE Spans within this text are applied to style composing regions
within an EditText widget. The text content is ignored and not used. -->
<string name="candidates_style" translatable="false"><u>candidates</u></string>
</resources> </resources>

2
core/res/res/values/strings.xml
View File

@@ -3122,8 +3122,6 @@
<string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
<string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
<string name="candidates_style"><u>candidates</u></string>
<!-- External media notification strings --> <!-- External media notification strings -->
<skip /> <skip />