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

Commit 59183b0e authored by Simon Wingrove's avatar Simon Wingrove Committed by Automerger Merge Worker
Browse files

Merge "Bool to note Pending Intent bug fixed" into tm-qpr-dev am: 5d68dd58 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19321786



Change-Id: I6c0058301c05a0faf123216c6df558bcacf388a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 197091ca 5d68dd58

color-check-baseline.xml

+52 −20
Original line number Diff line number Diff line
@@ -4405,12 +4405,12 @@ 
        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"

        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"

        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rXC/strings.xml"

            line="3152"

            column="170"/>

            file="res/values-en-rAU/strings.xml"

            line="3173"

            column="64"/>

    </issue>



    <issue
@@ -4424,8 +4424,8 @@ 
        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"

        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rAU/strings.xml"

            line="3157"

            file="res/values-en-rCA/strings.xml"

            line="3173"

            column="64"/>

    </issue>
@@ -4440,8 +4440,8 @@ 
        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"

        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rCA/strings.xml"

            line="3157"

            file="res/values-en-rGB/strings.xml"

            line="3173"

            column="64"/>

    </issue>
@@ -4456,8 +4456,8 @@ 
        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"

        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rGB/strings.xml"

            line="3157"

            file="res/values-en-rIN/strings.xml"

            line="3173"

            column="64"/>

    </issue>
@@ -4469,12 +4469,12 @@ 
        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"

        errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"

        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rIN/strings.xml"

            line="3157"

            column="64"/>

            file="res/values-en-rXC/strings.xml"

            line="3173"

            column="170"/>

    </issue>



    <issue
@@ -4489,7 +4489,7 @@ 
        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/strings.xml"

            line="7160"

            line="7204"

            column="36"/>

    </issue>
@@ -4749,6 +4749,38 @@ 
            column="40"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="        &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_dark&lt;/item>"

        errorLine2="                                       ^">

        <location

            file="res/values/themes_suw.xml"

            line="145"

            column="40"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="        &lt;item name=&quot;wifi_signal_color&quot;>@color/setup_wizard_wifi_color_light&lt;/item>"

        errorLine2="                                       ^">

        <location

            file="res/values/themes_suw.xml"

            line="164"

            column="40"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -4761,7 +4793,7 @@ 
        errorLine2="                                          ^">

        <location

            file="res/values/themes_suw.xml"

            line="196"

            line="233"

            column="43"/>

    </issue>
@@ -4777,7 +4809,7 @@ 
        errorLine2="                                         ^">

        <location

            file="res/values/themes_suw.xml"

            line="197"

            line="234"

            column="42"/>

    </issue>
@@ -4793,7 +4825,7 @@ 
        errorLine2="                                            ^">

        <location

            file="res/values/themes_suw.xml"

            line="198"

            line="235"

            column="45"/>

    </issue>

res/values/bools.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2022, 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>

  <!-- Referenced outside of Settings to confirm bug fixed - bug involved multiple

  pending intents with difference only in intent extras, which doesn't work. -->

  <bool name="config_isSafetyCenterLockScreenPendingIntentFixed">true</bool>

</resources>