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

Commit 36da7689 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge tag 'android-9.0.0_r31' into lineage-16.0-android-9.0.0_r31 

Android 9.0.0 Release 31 (PQ2A.190205.001)

* tag 'android-9.0.0_r31': (29 commits)
  Hide quicksetting tile for dev options when it's turned off
  Import translations. DO NOT MERGE
  Hide quicksetting tile for dev options when it's turned off
  Hide quicksetting tile for dev options when it's turned off
  Hide quicksetting tile for dev options when it's turned off
  Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
  Fix crash when starting daydream setting with wrong context
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  DO NOT MERGE Fix summary text for advanced button.
  Import translations. DO NOT MERGE
  Add entitlement check for usb tethering
  Import translations. DO NOT MERGE
  Fix Connect State message in Device details for Hearing Aids
  Import translations. DO NOT MERGE
  Add Feature Flag for Hearing Aid Profile
  To show hearing aids device in the available devices group
  Clean up task affinity.
  Add null check for vrManager
  Import translations. DO NOT MERGE
  ...

Change-Id: I3f0acf78d0e58907650953dffb767feeb536355d
parents 8d06a444 c103b546

AndroidManifest.xml

+4 −7
Original line number Diff line number Diff line
@@ -731,7 +731,6 @@ 
            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_notifications"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

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

                <action android:name="android.settings.ZEN_MODE_SETTINGS" />
@@ -933,7 +932,6 @@ 
            android:label="@string/night_display_title"

            android:enabled="@*android:bool/config_nightDisplayAvailable"

            android:icon="@drawable/ic_settings_night_display"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -1001,7 +999,7 @@ 


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

                  android:label="@string/about_settings"

                  android:icon="@drawable/ic_settings_about"

                  android:icon="@drawable/ic_homepage_about"

                  android:taskAffinity="com.android.settings"

                  android:parentActivityName="Settings">

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

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

            </intent-filter>

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

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

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

            </intent-filter>

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

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

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2663,7 +2661,6 @@ 
        <activity

            android:name="Settings$ZenAccessSettingsActivity"

            android:label="@string/manage_zen_access_title"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

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

                <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />
@@ -3220,7 +3217,7 @@ 
                  android:icon="@drawable/ic_homepage_support"

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

                  android:enabled="@bool/config_support_enabled">

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

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

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

            </intent-filter>

            <intent-filter>

color-check-baseline.xml

+43 −11
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ 
        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_connected_device_background&quot;>#71A234&lt;/color>"

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

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

        <location

            file="res/values/colors.xml"
@@ -1081,7 +1081,7 @@ 
        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_display_background&quot;>#FFB600&lt;/color>"

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

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

        <location

            file="res/values/colors.xml"
@@ -1177,7 +1177,7 @@ 
        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_system_background&quot;>#757575&lt;/color>"

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

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

        <location

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

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

        id="HardCodedColor"

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

        <location

            file="res/values/colors.xml"

            line="126"

            line="127"

            column="5"/>

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

        <location

            file="res/values/colors.xml"

            line="127"

            line="128"

            column="5"/>

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

        <location

            file="res/values/colors.xml"

            line="132"

            line="133"

            column="5"/>

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

        <location

            file="res/values/colors.xml"

            line="133"

            line="134"

            column="5"/>

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

        <location

            file="res/values/colors.xml"

            line="134"

            line="135"

            column="5"/>

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

        <location

            file="res/values/colors.xml"

            line="135"

            line="136"

            column="5"/>

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

        <location

            file="res/values/colors.xml"

            line="136"

            line="137"

            column="5"/>

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

        <location

            file="res/values/colors.xml"

            line="137"

            line="138"

            column="5"/>

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

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

        id="HardCodedColor"

        severity="Error"

res/drawable/ic_homepage_about.xml

0 → 100644
+36 −0
Original line number 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 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-af/strings.xml

+4 −5
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ 
    <skip />

    <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Swerfvoorkeur"</string>

  <string-array name="wifi_calling_mode_choices">

    <item msgid="2124257075906188844">"Verkieslik Wi-Fi"</item>

    <item msgid="2124257075906188844">"Wi-Fi verkies"</item>

    <item msgid="1335127656328817518">"Verkies mobiel"</item>

    <item msgid="3132912693346866895">"Net Wi-Fi"</item>

  </string-array>
@@ -990,7 +990,7 @@ 
    <item msgid="3194458950573886239">"0"</item>

  </string-array>

  <string-array name="wifi_calling_mode_choices_without_wifi_only">

    <item msgid="5782108782860004851">"Verkieslik Wi-Fi"</item>

    <item msgid="5782108782860004851">"Verkies Wi-Fi"</item>

    <item msgid="5074515506087318555">"Verkies mobiel"</item>

  </string-array>

  <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -3889,9 +3889,9 @@ 
    <string name="notification_log_details_none" msgid="184131801230614059">"geen"</string>

    <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Graderingvoorwerp ontbreek."</string>

    <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Graderingvoorwerp bevat nie hierdie sleutel nie."</string>

    <string name="display_cutout_emulation" msgid="6306593933746393170">"Simuleer \'n skerm met \'n knipmodel"</string>

    <string name="display_cutout_emulation" msgid="7466869822418376317">"Skermuitsnede"</string>

    <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"skermuitsnede, uitkeep"</string>

    <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Geen"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Toestelverstek"</string>

    <string name="special_access" msgid="3458780842491881155">"Spesiale app-toegang"</string>

    <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">

      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> programme kan onbeperkte data gebruik</item>
@@ -4152,5 +4152,4 @@ 
    <string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkbesonderhede"</string>

    <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel of \'n Wi-Fi-warmkol opstel."</string>

    <string name="devices_title" msgid="7701726109334110391">"Toestelle"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Verstek"</string>

</resources>