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

Skip to content
Unverified Commit 524ce05c authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20

Android 15.0.0 Release 20 (BP1A.250305.019)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8epWAAKCRDorT+BmrEO
# eHYlAJ0ca8t+MGpak4IFsNffL26u4/4b0QCfYniODmOFkJ80uknqxcv9VQc2ji8=
# =7/gR
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar  5 03:31:04 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-15.0.0_r20': (46 commits)
  Import translations. DO NOT MERGE ANYWHERE
  [DocsUI M3] Update styles for the filter bar
  [DocsUI M3] Uplift filter bar (search chips)
  DocsUI M3: Enable fixed navigation for file picker
  DocsUI M3: Remove layout variance based on window height
  DocsUI M3: Remove the variant 720dp-land.
  DocumentsUI: Move layout folder to be behind flag M3 disabled
  DocumentsUI: Duplicate layout folder to be behind flag M3 enabled
  Add "Compress" menu item to context menu
  [DocsUI Search] Add a DocsUI search flag.
  DocsUI: Material3 for the overall fixed layout
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  [DocsUI M3] Move drawable resources for flag M3 disabled
  [DocsUI M3] Dupliate drawable resources for M3 eanbled
  [DocsUI M3] Use Material 3 Styles/TextAppearances
  Add benreich to OWNERS
  Add benreich to OWNERS
  ...

 Conflicts:
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_apk.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_audio.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_certificate.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_codes.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_compressed.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_contact.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_document.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_event.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_excel.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_folder.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_font.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_generic.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_image.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_pdf.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_powerpoint.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_presentation.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_spreadsheet.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_text.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_video.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_doc_word.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_launcher_background.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_launcher_foreground.xml
	res/flag(!com.android.documentsui.flags.use_material3)/drawable/ic_launcher_monochrome.xml
	src/com/android/documentsui/MenuManager.java

Change-Id: I491690f97448eb28814f32cb1e8c618953786fc6
parents 2b776897 7708fc82
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