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

Skip to content
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
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment