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

Unverified Commit 8b8cb111 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+BmrEOeAUCZ8epYgAKCRDorT+BmrEO
# eEk6AJ0SDe0Jr6ZhbGmfaeh4InfLDx3iVwCdHcN4FzyPpea5vX3A0xLKsbBFwuI=
# =QXtH
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar  5 03:31:14 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': (77 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Revert "Fix the layout of the grid option customization (2/2)"
  Fix the layout of the grid option customization (2/2)
  Migrates Monet's Style Enum to @IntDef
  Use bouncy grid option item
  Bind Toolbar colors (2/2)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Make preview smartspace corresponds to the selected clock (1/3)
  Delay color picker back navigation until apply is complete
  Make clock in lockscreen preview use the correct overlayed resources
  Added dependencies in ThemePicker for packagenotifier
  Add disbled background for the apply button (1/2)
  Import translations. DO NOT MERGE ANYWHERE
  Remove Beta tag from themed icon toggle
  Fix the icon for clock style
  Fix clock edit button cropped when overscroll
  Fix clock view out of bound in the carousel
  Revert "Revert "Revert "Revert "Replace field injection with con..."
  Clock thumbnail on clock customization entry
  ...

 Conflicts:
	res/layout/themed_icon_section_view.xml
	res/values/dimens.xml

Change-Id: I805d703ffd46c169d314aa7355321cf4cf56088a
parents 1c8d1e0a 624a8028

res/drawable/clock_font_apply.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="72dp"

    android:height="56dp"

    android:viewportWidth="72"

    android:viewportHeight="56">

  <group>

    <clip-path

        android:pathData="M0,0h72v56h-72z"/>

    <group>

      <clip-path

          android:pathData="M0,28C0,12.536 12.536,0 28,0H44C59.464,0 72,12.536 72,28C72,43.464 59.464,56 44,56H28C12.536,56 0,43.464 0,28Z"/>

      <path

          android:pathData="M0,28C0,12.536 12.536,0 28,0H44C59.464,0 72,12.536 72,28C72,43.464 59.464,56 44,56H28C12.536,56 0,43.464 0,28Z"

          android:fillColor="@color/system_on_primary"/>

      <group>

        <clip-path

            android:pathData="M24,16h24v24h-24z"/>

        <path

            android:pathData="M33.55,34L27.85,28.3L29.275,26.875L33.55,31.15L42.725,21.975L44.15,23.4L33.55,34Z"

            android:fillColor="@color/system_primary"/>

      </group>

    </group>

  </group>

</vector>

res/drawable/clock_font_revert.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="72dp"

    android:height="56dp"

    android:viewportWidth="72"

    android:viewportHeight="56">

  <group>

    <clip-path

        android:pathData="M0,0h72v56h-72z"/>

    <group>

      <clip-path

          android:pathData="M0,28C0,12.536 12.536,0 28,0H44C59.464,0 72,12.536 72,28C72,43.464 59.464,56 44,56H28C12.536,56 0,43.464 0,28Z"/>

      <path

          android:pathData="M0,28C0,12.536 12.536,0 28,0H44C59.464,0 72,12.536 72,28C72,43.464 59.464,56 44,56H28C12.536,56 0,43.464 0,28Z"

          android:fillColor="@color/system_secondary_container"/>

      <group>

        <clip-path

            android:pathData="M24,16h24v24h-24z"/>

        <path

            android:pathData="M30.4,35L29,33.6L34.6,28L29,22.4L30.4,21L36,26.6L41.6,21L43,22.4L37.4,28L43,33.6L41.6,35L36,29.4L30.4,35Z"

            android:fillColor="@color/system_on_secondary_container"/>

      </group>

    </group>

  </group>

</vector>

res/drawable/clock_font_switch_divider.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 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="6dp"

    android:height="48dp"

    android:viewportWidth="6"

    android:viewportHeight="48">

  <path

      android:pathData="M2,11C2,10.448 2.448,10 3,10C3.552,10 4,10.448 4,11V37C4,37.552 3.552,38 3,38C2.448,38 2,37.552 2,37V11Z"

      android:fillColor="@color/system_outline"/>

</vector>

res/drawable/edit_icon.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="48dp"

    android:height="48dp"

    android:viewportWidth="48"

    android:viewportHeight="48">

  <group>

    <clip-path

        android:pathData="M8,24C8,15.163 15.163,8 24,8C32.837,8 40,15.163 40,24C40,32.837 32.837,40 24,40C15.163,40 8,32.837 8,24Z"/>

    <path

        android:pathData="M8,24C8,15.163 15.163,8 24,8C32.837,8 40,15.163 40,24C40,32.837 32.837,40 24,40C15.163,40 8,32.837 8,24Z"

        android:fillColor="@color/system_on_primary_fixed_variant"/>

    <group>

      <clip-path

          android:pathData="M14,14h20v20h-20z"/>

      <path

          android:pathData="M17,31V27.813L27.375,17.438C27.528,17.285 27.694,17.174 27.875,17.104C28.056,17.035 28.243,17 28.438,17C28.632,17 28.819,17.035 29,17.104C29.181,17.174 29.347,17.285 29.5,17.438L30.563,18.5C30.715,18.653 30.826,18.819 30.896,19C30.965,19.181 31,19.368 31,19.563C31,19.757 30.965,19.944 30.896,20.125C30.826,20.306 30.715,20.472 30.563,20.625L20.188,31H17ZM28.438,20.625L29.5,19.563L28.438,18.5L27.375,19.563L28.438,20.625Z"

          android:fillColor="#ffffff"/>

    </group>

  </group>

</vector>

res/drawable/ic_apps_filled_24px.xml

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

  ~ Copyright (C) 2024 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" android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white" android:pathData="M240,800Q207,800 183.5,776.5Q160,753 160,720Q160,687 183.5,663.5Q207,640 240,640Q273,640 296.5,663.5Q320,687 320,720Q320,753 296.5,776.5Q273,800 240,800ZM480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM720,800Q687,800 663.5,776.5Q640,753 640,720Q640,687 663.5,663.5Q687,640 720,640Q753,640 776.5,663.5Q800,687 800,720Q800,753 776.5,776.5Q753,800 720,800ZM240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560ZM240,320Q207,320 183.5,296.5Q160,273 160,240Q160,207 183.5,183.5Q207,160 240,160Q273,160 296.5,183.5Q320,207 320,240Q320,273 296.5,296.5Q273,320 240,320ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320ZM720,320Q687,320 663.5,296.5Q640,273 640,240Q640,207 663.5,183.5Q687,160 720,160Q753,160 776.5,183.5Q800,207 800,240Q800,273 776.5,296.5Q753,320 720,320Z"/>

</vector>
 
 No newline at end of file