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

Commit f93898e3 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR1 

Merged-In: I611902ed3d1588b743c1d58d176874aded5bbd85
Bug: 315507370
Change-Id: Iabf677c7b24d0ce56d98d5ab751d674c01b08892
parents 2585ebb7 80d19f41

.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*.iml

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ java_defaults { 
        "androidx.lifecycle_lifecycle-viewmodel-ktx",

        "androidx.recyclerview_recyclerview",

        "SystemUICustomizationLib",

        "hilt_android",

    ],



    jni_libs: [

OWNERS

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#Refer the WallpaperPicker2/ThemePicker owners here

include platform/packages/apps/WallpaperPicker2:/OWNERS

TEST_MAPPING

+0 −16
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "WallpaperPicker2Tests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    },

    {

      "name": "ThemePickerTests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    },

    {

      "name": "WallpaperPickerGoogleTests",

      "options": [

res/drawable/carousel_item_card_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/color_surface" />

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

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

</shape>
 
 No newline at end of file