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

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

Merge "Fix ThemePicker for use_resource_processor: true" into main

parents 1b4a126a 2d11b391

AndroidManifest-empty.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.wallpaper">

          package="com.android.themepicker">

</manifest>

src/com/android/customization/model/ResourceConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import android.content.Context; 
import android.content.res.Resources;

import android.provider.Settings.Secure;



import com.android.wallpaper.R;

import com.android.themepicker.R;



import java.util.ArrayList;

import java.util.Arrays;

src/com/android/customization/model/color/ColorCustomizationManager.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import com.android.customization.model.ResourceConstants; 
import com.android.customization.model.color.ColorOptionsProvider.ColorSource;

import com.android.customization.model.theme.OverlayManagerCompat;

import com.android.customization.module.logging.ThemesUserEventLogger;

import com.android.wallpaper.R;

import com.android.themepicker.R;



import org.json.JSONArray;

import org.json.JSONException;

src/com/android/customization/model/color/ColorOption.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.customization.model.CustomizationOption; 
import com.android.customization.model.color.ColorOptionsProvider.ColorSource;

import com.android.customization.module.logging.ThemesUserEventLogger;

import com.android.systemui.monet.Style;

import com.android.wallpaper.R;

import com.android.themepicker.R;



import org.json.JSONException;

import org.json.JSONObject;

src/com/android/customization/model/color/ColorOptionImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import androidx.annotation.ColorInt 
import com.android.customization.model.color.ColorOptionsProvider.ColorSource

import com.android.customization.picker.color.shared.model.ColorType

import com.android.systemui.monet.Style

import com.android.wallpaper.R

import com.android.themepicker.R



/**

 * Represents a color option in the revamped UI, it can be used for both wallpaper and preset colors