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

Unverified Commit 5b06dc26 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r32' into staging/lineage-18.1_merge-android-11.0.0_r32 

Android 11.0.0 Release 32 (RQ2A.210305.006)

* tag 'android-11.0.0_r32':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add the explicitly mutable flag for creating a PendingIntent
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  [Settings] code refactor - rename isSubscriptionCanBeDisplayed
  [Settings] Only display 1 SIM UI when multiple with same group UUID
  Automatically dismiss SIM combination warnings and selection dialogs.
  Update Battery Defender tips title
  Move eSIM reset before telephony manager reset in ResetNetworkConfirm
  Add condition to check case of accessory combinations
  Do nothing when choosing file transfer when in accessory mode
  Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit.
  Import translations. DO NOT MERGE ANYWHERE
  Prevent overlay drawing on top of Bluetooth activity dialog
  Migrate media output switcher metrics - 2/n
  Add Battery Defender feature to Settings
  Fix output switcher will show 2 media sessions in some use cases
  Update the Warning text about the visibility of device name.
  Update Settings Battery Defender strings
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority
  Redirect to output switcher panel to the new dialog
  Update rule of launching media output dialog
  Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
  Add PairNewBluetoothReceiver to launch Bluetooth pairing page
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Fix output switcher will show 2 media session when remote playing
  Revert^2 "Update the summary of AoD when Bedtime mode is on"
  Revert "Import translations. DO NOT MERGE ANYWHERE"
  Prevent overlay drawing on top of Bluetooth activity dialog
  Add bluetooth package to permission request intent
  Add Battery Defender strings to Settings
  Revert "Update the summary of AoD when Bedtime mode is on"
  Import translations. DO NOT MERGE ANYWHERE
  Update the summary of AoD when Bedtime mode is on
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog
  Fix the bug of losing Wi-Fi certificate when editing
  Update signal strength on ServiceState in service
  Update related UI if battery is not present
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Use ColorMatrixColorFilter in batterymeterview
  Fix the Wi-Fi detailed settings un-editable issue.
  To fix bug, summary is wrong if nr_enabled_bool=false
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Update NotificationChannelSettings Preferences in place to prevent re-layout.
  Hide 'View plan' button in data usage settings
  Reduce the flickering of injected items when package is changed
  Import translations. DO NOT MERGE ANYWHERE
  Hide tethering option when in a guest account

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/core/SettingsBaseActivity.java
	src/com/android/settings/panel/VolumePanel.java

Change-Id: Idfd0e81a154abe406844346a1ea357e8138403ce
parents c4a02fd9 db10b5d0

AndroidManifest.xml

+12 −1
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ 
    <uses-permission android:name="android.permission.INSTALL_DYNAMIC_SYSTEM" />

    <uses-permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" />

    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

    <uses-permission android:name="android.permission.READ_DREAM_STATE" />

    <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION" />



    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher"
@@ -3414,6 +3416,15 @@ 
                       android:value="com.android.settings.sound.MediaControlsSettings" />

        </activity>



        <receiver

            android:name=".media.BluetoothPairingReceiver"

            android:exported="true"

            android:permission="android.permission.BLUETOOTH_ADMIN">

            <intent-filter>

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

            </intent-filter>/>

        </receiver>



        <activity android:name=".backup.transport.TransportActivity"

                  android:label="@string/backup_transport_title"

                  android:icon="@drawable/ic_settings_backup"

res/layout/battery_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    style="@style/EntityHeader">



    <LinearLayout

        android:id="@+id/battery_info_layout"

        android:layout_width="170dp"

        android:layout_height="wrap_content"

        android:layout_marginStart="72dp"

res/values-af/strings.xml

+6 −1
Original line number Diff line number Diff line
@@ -2429,6 +2429,8 @@ 
    <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet is meer as gewoonlik gebruik"</string>

    <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Toestel is meer as gewoonlik gebruik"</string>

    <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Battery kan gouer as gewoonlik afloop"</string>

    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimeer tans vir batterygesondheid"</string>

    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Battery word tydelik beperk. Tik om meer te wete te kom."</string>

    <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Jou foon is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\nTopprogramme volgens batterygebruik:"</string>

    <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Jou tablet is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\nTopprogramme volgens batterygebruik:"</string>

    <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Jou toestel is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\nTopprogramme volgens batterygebruik:"</string>
@@ -2484,6 +2486,8 @@ 
      <item quantity="one">%1$d program word beperk</item>

    </plurals>

    <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>

    <string name="battery_missing_message" msgid="5202575301365811053">"Kon nie jou batterymeter te lees nie"</string>

    <string name="battery_missing_help_message" msgid="4583322687535428926">"Kon nie jou batterymeter te lees nie. Tik om "<annotation id="url">"meer te wete te kom"</annotation></string>

    <string name="dialog_stop_title" msgid="5972757101865665655">"Stop program?"</string>

    <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Jou foon kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou foon wakker hou.\n\nOm te probeer om hierdie kwessie op te los, kan jy die program stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>

    <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Jou tablet kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou tablet wakker hou.\n\nOm te probeer om hierdie kwessie op te los, kan jy die program stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
@@ -4697,7 +4701,7 @@ 
    <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Aan (demp)"</string>

    <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Af"</string>

    <string name="pref_title_network_details" msgid="7329759534269363308">"Netwerkbesonderhede"</string>

    <string name="about_phone_device_name_warning" msgid="764557372426153827">"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="about_phone_device_name_warning" msgid="1938930553285875166">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel, aan \'n wi-fi-netwerk koppel of \'n wi-fi-warmkol opstel."</string>

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

    <string name="homepage_all_settings" msgid="1877827279189801035">"Alle instellings"</string>

    <string name="homepage_personal_settings" msgid="8312279476519359656">"Voorstelle"</string>
@@ -4957,4 +4961,5 @@ 
    <string name="media_controls_no_players" msgid="3493023121892175946">"Geen spelers beskikbaar nie"</string>

    <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>

    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth sal aanskakel"</string>

    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nie beskikbaar nie omdat slaaptydmodus aan is"</string>

</resources>

res/values-am/strings.xml

+6 −1
Original line number Diff line number Diff line
@@ -2429,6 +2429,8 @@ 
    <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ጡባዊው ከተለመደው በላይ ስራ ላይ ውሏል"</string>

    <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"መሣሪያው ከተለመደው በላይ ስራ ላይ ውሏል"</string>

    <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ባትሪ ከተጠበቀው ጊዜ ቀድሞ ሊያልቅ ይችላል"</string>

    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ለባትሪ ጤና ማመቻቸት"</string>

    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ባትሪ ለጊዜው ተገድቧል። የበለጠ ለመረዳት መታ ያድርጉ።"</string>

    <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"የእርስዎ ስልክ ከመደበኛው በላይ ሥራ ላይ ውሏል። የእርስዎ ባትሪ ከተጠበቀው ቀድሞ ሊያልቅ ይችል ይሆናል።\n\nበባትሪ አጠቃቀም ረገድ ከፍተኛ መተግበሪያዎች፦"</string>

    <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"የእርስዎ ጡባዊ ከመደበኛው በላይ ሥራ ላይ ውሏል። የእርስዎ ባትሪ ከተጠበቀው ቀድሞ ሊያልቅ ይችል ይሆናል።\n\nበባትሪ አጠቃቀም ረገድ ከፍተኛ መተግበሪያዎች፦"</string>

    <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"የእርስዎ መሣሪያ ከተለመደው ጊዜ በላይ ጥቅም ላይ ውሏል። የእርስዎ ባትሪ ከተጠበቀው ቀድሞ ሊያልቅ ይችል ይሆናል።\n\nበባትሪ አጠቃቀም ረገድ ከፍተኛ መተግበሪያዎች፦"</string>
@@ -2484,6 +2486,8 @@ 
      <item quantity="other">%1$d መተግበሪያዎች ተገድበዋል</item>

    </plurals>

    <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>

    <string name="battery_missing_message" msgid="5202575301365811053">"የባትሪ መለኪያዎን የማንበብ ችግር"</string>

    <string name="battery_missing_help_message" msgid="4583322687535428926">"የባትሪ መለኪያዎን የማንበብ ችግር። "<annotation id="url">"የበለጠ ለመረዳት"</annotation>" መታ ያድርጉ"</string>

    <string name="dialog_stop_title" msgid="5972757101865665655">"መተግበሪያ ይቁም?"</string>

    <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> ስልክዎን እንደነቃ እያቆየው ስለሆነ ስልክዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት መተግበሪያውን ማቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማራገፍ ሊኖርብዎት ይችላል።"</string>

    <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> ጡባዊዎን እንደነቃ እያቆየው ስለሆነ ጡባዊዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት መተግበሪያውን ማቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማራገፍ ሊኖርብዎት ይችላል።"</string>
@@ -4697,7 +4701,7 @@ 
    <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"በርቷል (ድምጸ ተዘግቷል)"</string>

    <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ጠፍቷል"</string>

    <string name="pref_title_network_details" msgid="7329759534269363308">"የአውታረ መረብ ዝርዝሮች"</string>

    <string name="about_phone_device_name_warning" msgid="764557372426153827">"የእርስዎ መሣሪያ በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች የሚታይ ነው። ወድ ብሉቱዝ መሣሪያዎች ሲያገኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በተጨማሪ በሌሎች ሰዎች የሚታይ ይሆናል።"</string>

    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"የመሣሪያዎ ስም በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች ይታያል። እንዲሁም ከብሉቱዝ መሣሪያዎች ጋር ሲገናኙ፣ ከWi-Fi አውታረ መረብ ሲገናኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በሌሎች ሰዎች የሚታይ ሊሆን ይችላል።"</string>

    <string name="devices_title" msgid="649715719278562515">"መሣሪያዎች"</string>

    <string name="homepage_all_settings" msgid="1877827279189801035">"ሁሉም ቅንብሮች"</string>

    <string name="homepage_personal_settings" msgid="8312279476519359656">"የአስተያየት ጥቆማዎች"</string>
@@ -4957,4 +4961,5 @@ 
    <string name="media_controls_no_players" msgid="3493023121892175946">"ምንም ተጫዋቾች አይገኙም"</string>

    <string name="keywords_media_controls" msgid="8345490568291778638">"ሚዲያ"</string>

    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ብሉቱዝ ይበራል"</string>

    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"የመኝታ ሰዓት ሁነታ ስለበራ የማይገኝ"</string>

</resources>

res/values-ar/strings.xml

+15 −10

File changed.

Preview size limit exceeded, changes collapsed.