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

Unverified Commit e9959057 authored by Michael Bestas's avatar Michael Bestas Committed by Michael Bestas
Browse files

fixup! ThemePicker: Bring back fonts, icon pack, shape customization 

Fix build after enabling use_resource_processor

Change-Id: I41159dc809776ca7ca59ac3ac6c4f7a8c549ce32
parent 8b8cb111

src/com/android/customization/model/font/FontOption.java

+2 −3
Original line number Diff line number Diff line
@@ -25,13 +25,12 @@ import android.view.ViewGroup; 
import android.widget.ImageView;

import android.widget.TextView;



import com.android.wallpaper.R;

import com.android.wallpaper.util.ResourceUtils;



import com.android.customization.model.CustomizationManager;

import com.android.customization.model.CustomizationOption;

import com.android.customization.model.ResourceConstants;

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

import com.android.themepicker.R;

import com.android.wallpaper.util.ResourceUtils;



import java.util.ArrayList;

import java.util.HashMap;

src/com/android/customization/model/font/FontOptionProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.util.Log; 


import com.android.customization.model.ResourceConstants;

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

import com.android.wallpaper.R;

import com.android.themepicker.R;



import java.util.ArrayList;

import java.util.HashMap;

src/com/android/customization/model/font/FontSectionController.java

+3 −5
Original line number Diff line number Diff line
@@ -27,16 +27,14 @@ import androidx.annotation.Nullable; 
import com.android.customization.model.CustomizationManager.Callback;

import com.android.customization.model.CustomizationManager.OptionsFetchedListener;

import com.android.customization.model.CustomizationOption;

import com.android.customization.picker.font.FontFragment;

import com.android.customization.picker.font.FontSectionView;

import com.android.customization.widget.OptionSelectorController;

import com.android.customization.widget.OptionSelectorController.OptionSelectedListener;



import com.android.wallpaper.R;

import com.android.themepicker.R;

import com.android.wallpaper.model.CustomizationSectionController;

import com.android.wallpaper.util.LaunchUtils;



import com.android.customization.picker.font.FontFragment;

import com.android.customization.picker.font.FontSectionView;



import java.util.List;



/** A {@link CustomizationSectionController} for system fonts. */

src/com/android/customization/model/iconpack/IconPackOption.java

+2 −3
Original line number Diff line number Diff line
@@ -32,13 +32,12 @@ import android.view.ViewGroup; 
import android.widget.ImageView;

import android.widget.TextView;



import com.android.wallpaper.R;

import com.android.wallpaper.util.ResourceUtils;



import com.android.customization.model.CustomizationManager;

import com.android.customization.model.CustomizationOption;

import com.android.customization.model.ResourceConstants;

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

import com.android.themepicker.R;

import com.android.wallpaper.util.ResourceUtils;



import java.util.ArrayList;

import java.util.HashMap;

src/com/android/customization/model/iconpack/IconPackOptionProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.util.Log; 


import com.android.customization.model.ResourceConstants;

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

import com.android.wallpaper.R;

import com.android.themepicker.R;



import java.util.ArrayList;

import java.util.HashMap;