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

Commit a31c2ec2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5130385 from 1ba1a70d to pi-qpr2-release 

Change-Id: I641ad1361cf9c09aeb9e04afde2a203d20b7664b
parents 58953910 1ba1a70d

AndroidManifest.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -999,7 +999,7 @@ 




        <activity android:name=".Settings$MyDeviceInfoActivity"

        <activity android:name=".Settings$MyDeviceInfoActivity"

                  android:label="@string/about_settings"

                  android:label="@string/about_settings"

                  android:icon="@drawable/ic_settings_about"

                  android:icon="@drawable/ic_homepage_about"

                  android:taskAffinity="com.android.settings"

                  android:taskAffinity="com.android.settings"

                  android:parentActivityName="Settings">

                  android:parentActivityName="Settings">

            <intent-filter android:priority="1">

            <intent-filter android:priority="1">
@@ -1012,11 +1012,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            </intent-filter>

            <intent-filter android:priority="270">

            <intent-filter android:priority="-2">

                <action android:name="com.android.settings.action.SETTINGS" />

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.system" />

                       android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.title"

            <meta-data android:name="com.android.settings.title"

                       android:resource="@string/about_settings" />

                       android:resource="@string/about_settings" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3174,7 +3174,7 @@ 
                  android:icon="@drawable/ic_homepage_support"

                  android:icon="@drawable/ic_homepage_support"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Panel"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Panel"

                  android:enabled="@bool/config_support_enabled">

                  android:enabled="@bool/config_support_enabled">

            <intent-filter android:priority="-2">

            <intent-filter android:priority="-3">

                <action android:name="com.android.settings.action.SETTINGS"/>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            </intent-filter>

            <intent-filter>

            <intent-filter>

color-check-baseline.xml

+43 −11
Original line number Original line Diff line number Diff line
@@ -1033,7 +1033,7 @@ 
        priority="4"

        priority="4"

        summary="Using hardcoded color"

        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."

        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;color name=&quot;homepage_connected_device_background&quot;>#71A234&lt;/color>"

        errorLine1="    &lt;color name=&quot;homepage_connected_device_background&quot;>#72B70F&lt;/color>"

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

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"
@@ -1081,7 +1081,7 @@ 
        priority="4"

        priority="4"

        summary="Using hardcoded color"

        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."

        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;color name=&quot;homepage_display_background&quot;>#FFB600&lt;/color>"

        errorLine1="    &lt;color name=&quot;homepage_display_background&quot;>#FFA727&lt;/color>"

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

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"
@@ -1177,7 +1177,7 @@ 
        priority="4"

        priority="4"

        summary="Using hardcoded color"

        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."

        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;color name=&quot;homepage_system_background&quot;>#757575&lt;/color>"

        errorLine1="    &lt;color name=&quot;homepage_system_background&quot;>#9E9E9E&lt;/color>"

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

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"
@@ -1185,6 +1185,22 @@ 
            column="5"/>

            column="5"/>

    </issue>

    </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;color name=&quot;homepage_about_background&quot;>#9FA8DA&lt;/color>"

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

        <location

            file="res/values/colors.xml"

            line="126"

            column="5"/>

    </issue>



    <issue

    <issue

        id="HardCodedColor"

        id="HardCodedColor"

        severity="Error"

        severity="Error"
@@ -1197,7 +1213,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="126"

            line="127"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1213,7 +1229,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="127"

            line="128"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1229,7 +1245,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="132"

            line="133"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1245,7 +1261,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="133"

            line="134"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1261,7 +1277,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="134"

            line="135"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1277,7 +1293,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="135"

            line="136"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1293,7 +1309,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="136"

            line="137"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1309,7 +1325,7 @@ 
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

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

        <location

        <location

            file="res/values/colors.xml"

            file="res/values/colors.xml"

            line="137"

            line="138"

            column="5"/>

            column="5"/>

    </issue>

    </issue>
@@ -1633,6 +1649,22 @@ 
            column="9"/>

            column="9"/>

    </issue>

    </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="                android:color=&quot;@color/homepage_about_background&quot; />"

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

        <location

            file="res/drawable/ic_homepage_about.xml"

            line="23"

            column="17"/>

    </issue>



    <issue

    <issue

        id="HardCodedColor"

        id="HardCodedColor"

        severity="Error"

        severity="Error"

res/drawable/ic_homepage_about.xml

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

<!--

  Copyright (C) 2018 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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">



    <item>

        <shape android:shape="oval">

            <solid

                android:color="@color/homepage_about_background" />

            <size

                android:width="@dimen/dashboard_tile_image_size"

                android:height="@dimen/dashboard_tile_image_size" />

        </shape>

    </item>



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_phone_info" />

</layer-list>

res/drawable/ic_phone_info.xml

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7v-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>

</vector>

res/values-bs/strings.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -2049,11 +2049,11 @@ 
    <string name="captioning_preset" msgid="8939737196538429044">"Stil titlova"</string>

    <string name="captioning_preset" msgid="8939737196538429044">"Stil titlova"</string>

    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Prilagođene opcije"</string>

    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Prilagođene opcije"</string>

    <string name="captioning_background_color" msgid="9053011212948992570">"Boja pozadine"</string>

    <string name="captioning_background_color" msgid="9053011212948992570">"Boja pozadine"</string>

    <string name="captioning_background_opacity" msgid="6029993616419971202">"Neprozirnost pozadine"</string>

    <string name="captioning_background_opacity" msgid="6029993616419971202">"Prozirnost pozadine"</string>

    <string name="captioning_window_color" msgid="6902052743419717394">"Boja prozora za titlove"</string>

    <string name="captioning_window_color" msgid="6902052743419717394">"Boja prozora za titlove"</string>

    <string name="captioning_window_opacity" msgid="5041556024849862376">"Neprozirnost prozora naslova"</string>

    <string name="captioning_window_opacity" msgid="5041556024849862376">"Prozirnost prozora naslova"</string>

    <string name="captioning_foreground_color" msgid="85623486537640059">"Boja teksta"</string>

    <string name="captioning_foreground_color" msgid="85623486537640059">"Boja teksta"</string>

    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Neprozirnost teksta"</string>

    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Prozirnost teksta"</string>

    <string name="captioning_edge_color" msgid="3670094753735263238">"Boja rubova"</string>

    <string name="captioning_edge_color" msgid="3670094753735263238">"Boja rubova"</string>

    <string name="captioning_edge_type" msgid="5997247394951682154">"Vrsta rubova"</string>

    <string name="captioning_edge_type" msgid="5997247394951682154">"Vrsta rubova"</string>

    <string name="captioning_typeface" msgid="1826169240566563259">"Skup fontova"</string>

    <string name="captioning_typeface" msgid="1826169240566563259">"Skup fontova"</string>