Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04332d13 authored by Mark Renouf's avatar Mark Renouf Committed by android-build-merger
Browse files

resolve merge conflicts of 292c86da to cw-f-dev am: 0e37fdb7 

am: 931fa7e2

Change-Id: I59ccab899c91a2f24c6dca8224739b57623bb996
parents 9ca8427b 931fa7e2

core/res/res/values-watch/donottranslate.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?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>

core/res/res/values-watch/styles_material.xml

+0 −5
Original line number Diff line number Diff line
@@ -101,9 +101,4 @@ please see styles_device_defaults.xml. 
        <item name="gravity">@integer/config_dialogTextGravity</item>

        <item name="ellipsize">end</item>

    </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>

core/res/res/values/donottranslate.xml

+3 −0
Original line number Diff line number Diff line
@@ -26,4 +26,7 @@ 
    <string name="icu_abbrev_wday_month_day_no_year">eeeMMMMd</string>

    <!-- @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>

    <!-- @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>

core/res/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -3130,8 +3130,6 @@ 
    <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>

    <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>



    <string name="candidates_style"><u>candidates</u></string>



    <!-- External media notification strings -->

    <skip />