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

Unverified Commit 03cb15b5 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r10' into staging/lineage-22.1_merge-android-15.0.0_r10 

Android 15.0.0 release 10

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ32Y6wAKCRDorT+BmrEO
# eOflAJ4512r7aFz9dUy1F31uTITFJE0HYwCeIUpYDnI9Q4h+oO5fy/aMS8iVj24=
# =s+7M
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jan  7 23:13:15 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key

# By Marcelo Arteiro
# Via Android Build Coastguard Worker
* tag 'android-15.0.0_r10':
  Revert^2 "Temporary Revert to fix a Picker bug."

Change-Id: Icb11286e71e4cbdd9e4be10ddf9c1550c00ba164
parents 2183e804 a59564bc

iconloaderlib/res/values-night-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
*/

-->

<resources>

    <color name="themed_icon_color">@android:color/system_accent1_200</color>

    <color name="themed_icon_background_color">@android:color/system_accent2_800</color>

    <color name="themed_badge_icon_color">@android:color/system_accent2_800</color>

    <color name="themed_badge_icon_background_color">@android:color/system_accent1_200</color>

</resources>

iconloaderlib/res/values-night/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
** limitations under the License.

*/

-->

<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <color name="themed_icon_color">@androidprv:color/system_on_theme_app_dark</color>

    <color name="themed_icon_background_color">@androidprv:color/system_theme_app_dark</color>

<resources>

    <color name="themed_icon_color">#A8C7FA</color>

    <color name="themed_icon_background_color">#003355</color>

    <color name="themed_badge_icon_color">#003355</color>

    <color name="themed_badge_icon_background_color">#A8C7FA</color>

</resources>

iconloaderlib/res/values-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
*/

-->

<resources>

    <color name="themed_icon_color">@android:color/system_accent1_700</color>

    <color name="themed_icon_background_color">@android:color/system_accent1_100</color>

    <color name="themed_badge_icon_color">@android:color/system_accent1_700</color>

    <color name="themed_badge_icon_background_color">@android:color/system_accent1_100</color>

</resources>

iconloaderlib/res/values/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
** limitations under the License.

*/

-->

<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <color name="themed_icon_color">@androidprv:color/system_on_theme_app_light</color>

    <color name="themed_icon_background_color">@androidprv:color/system_theme_app_light</color>

<resources>

    <color name="themed_icon_color">#0842A0</color>

    <color name="themed_icon_background_color">#D3E3FD</color>

    <color name="themed_badge_icon_color">#0842A0</color>

    <color name="themed_badge_icon_background_color">#D3E3FD</color>