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

Commit bc698c81 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Use WallpaperPicker2Lib" into main

parents 4f3fb1c5 c9b3c572

Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ java_defaults { 
        "guava",

        "monet",

        "renderscript_toolkit",

        "wallpaper-common-deps",

        "WallpaperPicker2Lib",

        "SettingsLibSettingsTheme",

        "SystemUI-statsd",

        "styleprotoslite",
@@ -98,7 +98,6 @@ java_defaults { 
    ],



    srcs: [

        ":WallpaperPicker2_srcs",

        ":ThemePicker_srcs",

    ],
@@ -106,7 +105,7 @@ java_defaults { 


    use_embedded_native_libs: true,



    resource_zips: [":WallpaperPicker2_res", ":ThemePicker_res", ":ThemePicker_res_overrides"],

    resource_zips: [":ThemePicker_res", ":ThemePicker_res_overrides"],



    optimize: {

        enabled: false,

src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt

+1 −5
Original line number Diff line number Diff line
@@ -99,11 +99,7 @@ object ColorSectionViewBinder { 
                LayoutInflater.from(view.context)

                    .inflate(R.layout.color_option_no_background, view, false)

            item.payload?.let {

                ColorOptionIconBinder.bind(

                    itemView.requireViewById(R.id.option_tile),

                    item.payload,

                    night

                )

                ColorOptionIconBinder.bind(itemView.requireViewById(R.id.option_tile), it, night)

                ContentDescriptionViewBinder.bind(

                    view = itemView.requireViewById(R.id.option_tile),

                    viewModel = item.text,