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

Unverified Commit 829b1f73 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37 

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37': (34 commits)
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Hide unprovisioned MDN (phone number) at select profile dialog
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  5G meteredness for telephony framework
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  DO NOT MERGE - Track framework changes to crashApplication
  DO NOT MERGE
  Fix pendingIntent in SettingsSliceProvider could be Hijacked
  Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
  Import translations. DO NOT MERGE
  Fix security issue for using mock location without permission.
  [Wi-Fi] Ignore incorrect user certificates
  RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen
  RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen
  RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen
  [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null
  ...

Conflicts:
	res/values-ar/strings.xml
	res/values-da/strings.xml
	res/values-eu/strings.xml
	res/values-pl/strings.xml
	res/values/config.xml

Change-Id: Ie4891ecd7a81d5f08e3a4d093dd5514465670fd6
parents 2ac3f1e3 433e9902

res/layout/edit_user_info_dialog_content.xml

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
        android:labelFor="@id/user_photo"

        android:inputType="text|textCapWords"

        android:selectAllOnFocus="true"

        android:hint="@string/user_nickname"/>

        android:hint="@string/user_nickname"

        android:maxLength="100"/>



</LinearLayout>

res/layout/wifi_dialog.xml

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

                            android:layout_height="wrap_content"

                            style="@style/wifi_item_spinner"

                            android:prompt="@string/please_select_phase2"

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

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

                </LinearLayout>



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

res/values-af/arrays.xml

+16 −16
Original line number Diff line number Diff line
@@ -146,24 +146,21 @@ 
    <item msgid="3199281439582632425">"PWD"</item>

  </string-array>

  <string-array name="wifi_peap_phase2_entries">

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

    <item msgid="7999067440135784391">"MSCHAPV2"</item>

    <item msgid="4508543070243132707">"GTC"</item>

    <item msgid="8082624033981656770">"MSCHAPV2"</item>

    <item msgid="4182817453412578800">"GTC"</item>

  </string-array>

  <string-array name="wifi_peap_phase2_entries_with_sim_auth">

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

    <item msgid="6196154457987907739">"MSCHAPV2"</item>

    <item msgid="9026748161938741231">"GTC"</item>

    <item msgid="286525156248577475">"SIM"</item>

    <item msgid="7481822337687913543">"AKA"</item>

    <item msgid="5495954851156664290">"AKA\'"</item>

  </string-array>

  <string-array name="wifi_phase2_entries">

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

    <item msgid="2548160166342921510">"PAP"</item>

    <item msgid="2030080230898427253">"MSCHAP"</item>

    <item msgid="3925393308736149115">"MSCHAPV2"</item>

    <item msgid="1489443379153624742">"GTC"</item>

    <item msgid="5943169794516984261">"MSCHAPV2"</item>

    <item msgid="2379904471264702148">"GTC"</item>

    <item msgid="5248162884898921025">"SIM"</item>

    <item msgid="3148964951886919224">"AKA"</item>

    <item msgid="8987072060394684912">"AKA\'"</item>

  </string-array>

  <string-array name="wifi_ttls_phase2_entries">

    <item msgid="7970149422845752634">"PAP"</item>

    <item msgid="5204890303748068014">"MSCHAP"</item>

    <item msgid="2210309879499032393">"MSCHAPV2"</item>

    <item msgid="6686694694122598353">"GTC"</item>

  </string-array>

  <string-array name="wifi_ip_settings">

    <item msgid="6665889765350160154">"DHCP"</item>
@@ -550,4 +547,7 @@ 
    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (6624400115590055120) -->

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

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

    <!-- no translation found for rtt_setting_mode:1 (7903019313228349427) -->

    <!-- no translation found for rtt_setting_mode:2 (8525285145696236811) -->

    <!-- no translation found for rtt_setting_mode:3 (7725394146877517088) -->

</resources>

res/values-af/strings.xml

+3 −5
Original line number Diff line number Diff line
@@ -2394,10 +2394,8 @@ 
    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"Jou programme gebruik \'n gewone hoeveelheid batterykrag. As programme te veel batterykrag gebruik, sal jou toestel handelinge voorstel wat jy kan uitvoer.\n\nJy kan altyd Batterybespaarder aanskakel as jou battery begin pap raak."</string>

    <string name="smart_battery_manager_title" msgid="3677620516657920364">"Batterybestuurder"</string>

    <string name="smart_battery_title" msgid="9095903608520254254">"Bestuur programme outomaties"</string>

    <string name="smart_battery_summary" msgid="1492277404000064998">"Beperk die batterygebruik van programme wat jy nie gereeld gebruik nie"</string>

    <string name="smart_battery_footer" product="default" msgid="8407121907452993645">"Wanneer Batterybestuurder bespeur dat programme jou battery leegmaak, het jy die opsie om daardie programme te beperk. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>

    <string name="smart_battery_footer" product="tablet" msgid="8407121907452993645">"Wanneer Batterybestuurder bespeur dat programme jou battery leegmaak, het jy die opsie om daardie programme te beperk. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>

    <string name="smart_battery_footer" product="device" msgid="8407121907452993645">"Wanneer Batterybestuurder bespeur dat programme jou battery leegmaak, het jy die opsie om daardie programme te beperk. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>

    <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"Beperk die batterygebruik van programme wat jy nie gereeld gebruik nie"</string>

    <string name="smart_battery_footer" msgid="8407121907452993645">"Wanneer Batterybestuurder bespeur dat programme jou battery leegmaak, het jy die opsie om daardie programme te beperk. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>

    <string name="restricted_app_title" msgid="6585080822121007436">"Beperkte programme"</string>

    <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">

      <item quantity="other">Beperk tans batterygebruik vir %1$d programme</item>
@@ -2407,7 +2405,7 @@ 
    <string name="restricted_app_detail_footer" msgid="3683577206409650564">"Hierdie programme het battery in die agtergrond gebruik. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>

    <string name="battery_auto_restriction_title" msgid="827206218118093357">"Gebruik Batterybestuurder"</string>

    <string name="battery_auto_restriction_summary" msgid="2140896101984815711">"Bespeur wanneer programme battery leegmaak"</string>

    <string name="battery_manager_on" msgid="3197525907390349054">"Aan / Bespeur wanneer programme battery leegmaak"</string>

    <string name="battery_manager_on" product="default" msgid="3197525907390349054">"Aan / Bespeur wanneer programme battery leegmaak"</string>

    <string name="battery_manager_off" msgid="673547668722420924">"Af"</string>

    <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">

      <item quantity="other">%1$d programme word beperk</item>

res/values-am/arrays.xml

+16 −16
Original line number Diff line number Diff line
@@ -146,24 +146,21 @@ 
    <item msgid="3199281439582632425">"PWD"</item>

  </string-array>

  <string-array name="wifi_peap_phase2_entries">

    <item msgid="8923771320101021076">"ምንም"</item>

    <item msgid="7999067440135784391">"MSCHAPV2"</item>

    <item msgid="4508543070243132707">"GTC"</item>

    <item msgid="8082624033981656770">"MSCHAPV2"</item>

    <item msgid="4182817453412578800">"GTC"</item>

  </string-array>

  <string-array name="wifi_peap_phase2_entries_with_sim_auth">

    <item msgid="6784317080636348567">"ምንም የለም"</item>

    <item msgid="6196154457987907739">"MSCHAPV2"</item>

    <item msgid="9026748161938741231">"GTC"</item>

    <item msgid="286525156248577475">"ሲም"</item>

    <item msgid="7481822337687913543">"AKA"</item>

    <item msgid="5495954851156664290">"AKA\'"</item>

  </string-array>

  <string-array name="wifi_phase2_entries">

    <item msgid="9104917264573875301">"የለም"</item>

    <item msgid="2548160166342921510">"PAP"</item>

    <item msgid="2030080230898427253">"MSCHAP"</item>

    <item msgid="3925393308736149115">"MSCHAPV2"</item>

    <item msgid="1489443379153624742">"GTC"</item>

    <item msgid="5943169794516984261">"MSCHAPV2"</item>

    <item msgid="2379904471264702148">"GTC"</item>

    <item msgid="5248162884898921025">"ሲም"</item>

    <item msgid="3148964951886919224">"AKA"</item>

    <item msgid="8987072060394684912">"AKA\'"</item>

  </string-array>

  <string-array name="wifi_ttls_phase2_entries">

    <item msgid="7970149422845752634">"PAP"</item>

    <item msgid="5204890303748068014">"MSCHAP"</item>

    <item msgid="2210309879499032393">"MSCHAPV2"</item>

    <item msgid="6686694694122598353">"GTC"</item>

  </string-array>

  <string-array name="wifi_ip_settings">

    <item msgid="6665889765350160154">"DHCP"</item>
@@ -550,4 +547,7 @@ 
    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (6624400115590055120) -->

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

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

    <!-- no translation found for rtt_setting_mode:1 (7903019313228349427) -->

    <!-- no translation found for rtt_setting_mode:2 (8525285145696236811) -->

    <!-- no translation found for rtt_setting_mode:3 (7725394146877517088) -->

</resources>