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

Unverified Commit b7e8a7d2 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eLuCAJ9TgaVPRwWA4Iu06DqcoTACoMQVFQCeOgOB3D+m/bdk9NCkQGQRVMM1tFs=
# =s3b7
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2470 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By George Lin (33) and others
# Via Android Build Coastguard Worker (48) and others
* tag 'android-15.0.0_r6': (80 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Fix clock being clipped when scaled down in new customization picker ui
  Make colorContrast setting dependent on framework value
  Import translations. DO NOT MERGE ANYWHERE
  Increase max color options size
  Adding launch source info in the wallpaper picker intent (2/3)
  Match height for ColorSectionView and WallpaperQuickSwitchView
  Clock customization screen (1/3)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add changes for category wrapper
  Apply button
  Remove the SHAPE enrty
  Send messages to launcher renderer to update grid (2/3)
  Grid customiztion screen (1/2)
  Make java_sdk_library dependencies explicit
  Update More Wallpapers text color on system color change (2/2)
  Animate tab color change when system color is changed (2/2)
  Remove unused line in DoubleRowListItemSpacing
  ...

 Conflicts:
	res/values/dimens.xml
	src/com/android/customization/module/DefaultCustomizationSections.java
	src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt
	src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
	src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt
	src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt

Change-Id: I1576fd788f6a5a082c99e52ebe019d095904df99
parents eae14033 e4b89fe0

AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -84,6 +84,16 @@ 
            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity

            tools:node="replace"

            android:name="com.android.wallpaper.picker.customization.ui.CustomizationPickerActivity2"

            android:label="@string/app_name"

            android:relinquishTaskIdentity="true"

            android:resizeableActivity="false"

            android:theme="@style/WallpaperTheme"

            android:configChanges="assetsPaths"

            android:exported="false"/>



        <activity

            tools:node="replace"

            android:name="com.android.wallpaper.picker.PassThroughCustomizationPickerActivity"

res/drawable/color_overflow.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <shape

            android:shape="ring"

            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="-1dp"

            android:thickness="-2dp"

            android:useLevel="false">

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

        </shape>

res/drawable/customization_option_entry_icon_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


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

    android:shape="rectangle">

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

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

    <corners android:radius="18dp" />

</shape>
 
 No newline at end of file

res/drawable/horizontal_divider_16dp.xml

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

<!--

     Copyright (C) 2021 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">

    <size

        android:width="16dp"

        android:height="0dp" />

</shape>

res/drawable/horizontal_divider_4dp.xml

0 → 100644
+21 −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.

-->

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

    <size

        android:width="4dp"

        android:height="0dp" />

</shape>