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

Unverified Commit 2f6040dc authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r3' into staging/lineage-23.0_merge-android-16.0.0_r3 

Android 16.0.0 Release 3 (BP3A.250905.014)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaRO/HAAKCRDorT+BmrEO
# eO46AJ4wOUhqtBYUZOsyx5rJQI6MOTynMwCdHxJ0oKGfYcvrUwFUxqU546bTIn0=
# =hFJV
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov 12 00:56:28 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By George Lin (40) and others
# Via Android (Google) Code Review (101) and Android Build Coastguard Worker (74)
* tag 'android-16.0.0_r3': (127 commits)
  Add launcher extendible theme integration (2/3)
  Display current extendible theme icon (2/3)
  Add launcher extendible theme integration (2/3)
  Display current extendible theme icon (2/3)
  Import translations. DO NOT MERGE ANYWHERE
  Fixed selection of clock slider
  Import translations. DO NOT MERGE ANYWHERE
  Fix empty picker when launcher isn't ready
  Make shape grid manager fail safely
  Protect against another dead object exception
  Add floating sheet animation to Icons
  Add new entry point in icons floating sheet (2/3)
  Import translations. DO NOT MERGE ANYWHERE
  Added clock face width label
  Smooth scroll clock selection to center position
  Enable additional icon themes to be shown (1/2)
  desktop: Change lock screen clock color list to wrap content
  Rename themed icon repository to icon style repository (1/2)
  Add default and minimal icon style options
  Handle inital deep link shortcut slot ID (1/2)
  ...

 Conflicts:
	res/values-fr/strings.xml
	res/values-gu/strings.xml
	res/values-hi/strings.xml
	res/values-zh-rCN/strings.xml

Change-Id: I2600f643b659f0eca9ddeeb78356b2435d5e4c70
parents fd6492a2 de64711d

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ android_library { 
    static_libs: [

        "guava",

        "monet",

        "libmonet",

        "renderscript_toolkit",

        "WallpaperPicker2Lib",

        "SettingsLibSettingsTheme",

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
        <package android:name="com.android.launcher3"/>

        <package android:name="com.android.settings"/>

        <package android:name="com.android.systemui"/>

        <!-- Package of camera for icon shape -->

        <package android:name="com.android.camera2" />



        <!-- Specific intents Wallpaper picker query for -->

        <!-- Package for theme stub -->

res/drawable/circle_button.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2025 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.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:shape="oval">

    <solid android:color="@color/system_primary"></solid>

</shape>

res/drawable/ic_pack_theme_24px.xml

+4 −4
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:translateX="100"

    android:viewportHeight="1920"

    android:viewportWidth="1920">

    android:viewportHeight="2496"

    android:viewportWidth="2496">



    <group

        android:translateX="480"

        android:translateY="480">

        android:translateX="768"

        android:translateY="768">

        <path

            android:fillColor="?android:textColorPrimary"

            android:pathData="M340,240L260,160L340,80L420,160L340,240ZM800,700L720,620L800,540L880,620L800,700ZM205,868L92,755Q80,743 80,727Q80,711 92,699L455,335Q490,300 540,300Q590,300 625,335Q660,370 660,420Q660,470 625,505L261,868Q249,880 233,880Q217,880 205,868ZM740,401Q740,326 687,273Q634,220 559,220Q634,220 687,167.5Q740,115 740,40Q740,115 792.5,167.5Q845,220 920,220Q845,220 792.5,273Q740,326 740,401ZM484,533L484,533Q484,533 469.5,519Q455,505 455,505Q455,505 441,491Q427,477 427,477L427,477L455,505L484,533ZM233,784L484,533L427,477L177,727L233,784Z" />

res/drawable/ic_shapes.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2025 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.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~

  -->



<vector

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M360,640Q243,640 161.5,558.5Q80,477 80,360Q80,243 161.5,161.5Q243,80 360,80Q477,80 558.5,161.5Q640,243 640,360Q640,477 558.5,558.5Q477,640 360,640ZM320,800L320,718Q330,719 340,719.5Q350,720 360,720Q510,720 615,615Q720,510 720,360Q720,350 719.5,340Q719,330 718,320L800,320Q833,320 856.5,343.5Q880,367 880,400L880,800Q880,833 856.5,856.5Q833,880 800,880L400,880Q367,880 343.5,856.5Q320,833 320,800Z"/>

</vector>
 
 No newline at end of file