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

Commit b4fe2d06 authored by Xin Li's avatar Xin Li
Browse files

Merge Android10 QPR1 into AOSP master 

Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688
parents 9c2c1b47 944689ab

AndroidManifest.xml

+4 −8
Original line number Diff line number Diff line
@@ -2594,13 +2594,6 @@ 
                android:value="com.android.settings.notification.AppNotificationSettings" />

        </activity>



        <!-- Show channel group-level notification settings (group passed in as extras) -->

        <activity android:name="Settings$ChannelGroupNotificationSettingsActivity"

                  android:exported="true">

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

                       android:value="com.android.settings.notification.ChannelGroupNotificationSettings" />

        </activity>



        <!-- Show channel-level notification settings (channel passed in as extras) -->

        <activity android:name="Settings$ChannelNotificationSettingsActivity"

                  android:label="@string/notification_channel_title"
@@ -2714,7 +2707,7 @@ 


        <activity

            android:name=".wifi.NetworkRequestDialogActivity"

            android:theme="@style/Transparent"

            android:theme="@style/Theme.AlertDialog"

            android:excludeFromRecents="true"

            android:launchMode="singleTop"

            android:taskAffinity=".wifi.NetworkRequestDialogActivity"
@@ -3241,6 +3234,9 @@ 
        <activity android:name=".homepage.contextualcards.ContextualCardFeedbackDialog"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />



        <activity android:name=".homepage.contextualcards.FaceReEnrollDialog"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />



        <activity

            android:name="Settings$WifiCallingDisclaimerActivity"

            android:label="@string/wifi_calling_settings_title"

tests/robotests/res/values-as/config.xml→res/layout/empty_view.xml

+8 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 The Android Open Source Project

  Copyright (C) 2019 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.
@@ -14,8 +14,7 @@ 
  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>

</resources>
 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:visibility="gone"/>

res/layout/wifi_dialog.xml

+1 −2
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ 
                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            style="@style/wifi_item_spinner"

                            android:prompt="@string/wifi_eap_method"

                            android:entries="@array/wifi_eap_method" />

                            android:prompt="@string/wifi_eap_method" />

                </LinearLayout>



                <LinearLayout android:id="@+id/l_phase2"

res/values-af/arrays.xml

+2 −10
Original line number Diff line number Diff line
@@ -406,10 +406,8 @@ 
    <item msgid="8064740940687465039">"IPSec VPN met sertifikate en Xauth-stawing"</item>

    <item msgid="4946199982372391490">"IPSec VPN met sertifikate en hibriedstawing"</item>

  </string-array>

  <string-array name="vpn_proxy_settings">

    <item msgid="4474139132577932676">"Geen"</item>

    <item msgid="2943781954264525815">"Handmatig"</item>

  </string-array>

    <!-- no translation found for vpn_proxy_settings:0 (4474139132577932676) -->

    <!-- no translation found for vpn_proxy_settings:1 (2943781954264525815) -->

  <string-array name="vpn_states">

    <item msgid="8621078286418985762">"Ontkoppel"</item>

    <item msgid="6692305604213080515">"Inisialiseer tans..."</item>
@@ -531,10 +529,4 @@ 
    <item msgid="817971827645657949">"LTE/CDMA"</item>

    <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>

  </string-array>

    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (7586074022364606422) -->

    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (5950846260630506903) -->

    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2795368186689231672) -->

    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (3632552041956113517) -->

    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (8886675223048911179) -->

    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (8669821968941658558) -->

</resources>