diff --git a/src/com/android/customization/picker/BasePreviewAdapter.java b/src/com/android/customization/picker/BasePreviewAdapter.java
index a02cb7e..c3ddc1d 100644
--- a/src/com/android/customization/picker/BasePreviewAdapter.java
+++ b/src/com/android/customization/picker/BasePreviewAdapter.java
@@ -30,7 +30,7 @@
 import androidx.viewpager.widget.PagerAdapter;
 
 import com.android.customization.picker.BasePreviewAdapter.PreviewPage;
-import com.android.wallpaper.util.TileSizeCalculator;
+import com.android.wallpaper.util.SizeCalculator;
 import com.android.wallpaper.widget.PreviewPager;
 
 import java.util.ArrayList;
@@ -118,7 +118,7 @@
                         @Override
                         public void onLayoutChange(View v, int left, int top, int right, int bottom,
                                 int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                            card.setRadius(TileSizeCalculator.getPreviewCornerRadius(
+                            card.setRadius(SizeCalculator.getPreviewCornerRadius(
                                     mActivity, card.getMeasuredWidth()));
                             card.removeOnLayoutChangeListener(this);
                         }
diff --git a/src/com/android/customization/picker/grid/GridFullPreviewFragment.java b/src/com/android/customization/picker/grid/GridFullPreviewFragment.java
index 4803ca2..29d74de 100644
--- a/src/com/android/customization/picker/grid/GridFullPreviewFragment.java
+++ b/src/com/android/customization/picker/grid/GridFullPreviewFragment.java
@@ -57,8 +57,8 @@
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.picker.AppbarFragment;
+import com.android.wallpaper.util.SizeCalculator;
 import com.android.wallpaper.util.SurfaceViewUtils;
-import com.android.wallpaper.util.TileSizeCalculator;
 import com.android.wallpaper.util.WallpaperConnection;
 import com.android.wallpaper.widget.BottomActionBar;
 import com.android.wallpaper.widget.LiveTileOverlay;
@@ -145,7 +145,7 @@
                 ViewGroup.LayoutParams layoutParams = mCardView.getLayoutParams();
                 layoutParams.width = cardWidth;
                 mCardView.setLayoutParams(layoutParams);
-                mCardView.setRadius(TileSizeCalculator.getPreviewCornerRadius(
+                mCardView.setRadius(SizeCalculator.getPreviewCornerRadius(
                         getActivity(), mCardView.getMeasuredWidth()));
                 view.removeOnLayoutChangeListener(this);
             }
