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

Commit 7acefe5f authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Update for renamed TileSizeCalculartor 

Bug: 156035955
Change-Id: I8b31817889b0f97a2bf49be958b98182a927ba49
parent 6085ac8a

src/com/android/customization/picker/BasePreviewAdapter.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ import androidx.core.view.ViewCompat; 
import androidx.viewpager.widget.PagerAdapter;

import androidx.viewpager.widget.PagerAdapter;





import com.android.customization.picker.BasePreviewAdapter.PreviewPage;

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 com.android.wallpaper.widget.PreviewPager;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -118,7 +118,7 @@ public class BasePreviewAdapter<T extends PreviewPage> extends PagerAdapter { 
                        @Override

                        @Override

                        public void onLayoutChange(View v, int left, int top, int right, int bottom,

                        public void onLayoutChange(View v, int left, int top, int right, int bottom,

                                int oldLeft, int oldTop, int oldRight, int oldBottom) {

                                int oldLeft, int oldTop, int oldRight, int oldBottom) {

                            card.setRadius(TileSizeCalculator.getPreviewCornerRadius(

                            card.setRadius(SizeCalculator.getPreviewCornerRadius(

                                    mActivity, card.getMeasuredWidth()));

                                    mActivity, card.getMeasuredWidth()));

                            card.removeOnLayoutChangeListener(this);

                            card.removeOnLayoutChangeListener(this);

                        }

                        }

src/com/android/customization/picker/grid/GridFullPreviewFragment.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ import com.android.wallpaper.model.LiveWallpaperInfo; 
import com.android.wallpaper.model.WallpaperInfo;

import com.android.wallpaper.model.WallpaperInfo;

import com.android.wallpaper.module.InjectorProvider;

import com.android.wallpaper.module.InjectorProvider;

import com.android.wallpaper.picker.AppbarFragment;

import com.android.wallpaper.picker.AppbarFragment;

import com.android.wallpaper.util.SizeCalculator;

import com.android.wallpaper.util.SurfaceViewUtils;

import com.android.wallpaper.util.SurfaceViewUtils;

import com.android.wallpaper.util.TileSizeCalculator;

import com.android.wallpaper.util.WallpaperConnection;

import com.android.wallpaper.util.WallpaperConnection;

import com.android.wallpaper.widget.BottomActionBar;

import com.android.wallpaper.widget.BottomActionBar;

import com.android.wallpaper.widget.LiveTileOverlay;

import com.android.wallpaper.widget.LiveTileOverlay;
@@ -145,7 +145,7 @@ public class GridFullPreviewFragment extends AppbarFragment { 
                ViewGroup.LayoutParams layoutParams = mCardView.getLayoutParams();

                ViewGroup.LayoutParams layoutParams = mCardView.getLayoutParams();

                layoutParams.width = cardWidth;

                layoutParams.width = cardWidth;

                mCardView.setLayoutParams(layoutParams);

                mCardView.setLayoutParams(layoutParams);

                mCardView.setRadius(TileSizeCalculator.getPreviewCornerRadius(

                mCardView.setRadius(SizeCalculator.getPreviewCornerRadius(

                        getActivity(), mCardView.getMeasuredWidth()));

                        getActivity(), mCardView.getMeasuredWidth()));

                view.removeOnLayoutChangeListener(this);

                view.removeOnLayoutChangeListener(this);

            }

            }