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

Commit 7d376519 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9815530 from e4e1bfa5 to tm-qpr3-release

Change-Id: I3f5a160585936e37a0be127af42f238a21361eed
parents 3f25ba8f e4e1bfa5
Loading
Loading
Loading
Loading
+8 −26
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.widget.FrameLayout;
import androidx.annotation.Nullable;
import androidx.lifecycle.LifecycleOwner;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.widget.MarginPageTransformer;
import androidx.viewpager2.widget.ViewPager2;

import com.android.customization.model.CustomizationManager;
@@ -54,7 +53,6 @@ import com.android.wallpaper.R;
import com.android.wallpaper.model.CustomizationSectionController;
import com.android.wallpaper.model.WallpaperColorsViewModel;
import com.android.wallpaper.module.InjectorProvider;
import com.android.wallpaper.module.LargeScreenMultiPanesChecker;
import com.android.wallpaper.widget.PageIndicator;
import com.android.wallpaper.widget.SeparatedTabLayout;

@@ -104,7 +102,6 @@ public class ColorSectionController implements CustomizationSectionController<Co
            new Optional[]{Optional.empty(), Optional.empty()};
    private long mLastColorApplyingTime = 0L;
    private ColorSectionView mColorSectionView;
    private boolean mIsMultiPane;

    private static int getNumPages(int optionsPerPage, int totalOptions) {
        return (int) Math.ceil((float) totalOptions / optionsPerPage);
@@ -118,7 +115,6 @@ public class ColorSectionController implements CustomizationSectionController<Co
                new OverlayManagerCompat(activity));
        mWallpaperColorsViewModel = viewModel;
        mLifecycleOwner = lifecycleOwner;
        mIsMultiPane = new LargeScreenMultiPanesChecker().isMultiPanesEnabled(activity);

        if (savedInstanceState != null) {
            if (savedInstanceState.containsKey(KEY_COLOR_TAB_POSITION)) {
@@ -326,10 +322,8 @@ public class ColorSectionController implements CustomizationSectionController<Co
            subOptions = colorOptions;
        }

        final int padding = container.getContext().getResources().getDimensionPixelSize(
                R.dimen.section_horizontal_padding);
        OptionSelectorController<ColorOption> adaptiveController = new OptionSelectorController<>(
                container, subOptions, /* useGrid= */ true, CENTER, padding);
                container, subOptions, /* useGrid= */ true, CENTER);
        adaptiveController.initOptions(mColorManager);
        setUpColorOptionsController(adaptiveController);
    }
@@ -474,16 +468,6 @@ public class ColorSectionController implements CustomizationSectionController<Co
                mContainer = itemView.findViewById(R.id.color_page_container);
                // Correct scrolling goes under collapsing toolbar while scrolling oclor options.
                mContainer.getChildAt(0).setNestedScrollingEnabled(false);
                /**
                 * Sets page transformer with margin to separate color pages and
                 * sets color pages' padding to not scroll to window boundary if multi-pane case
                 */
                if (mIsMultiPane) {
                    final int padding = itemView.getContext().getResources().getDimensionPixelSize(
                            R.dimen.section_horizontal_padding);
                    mContainer.setPageTransformer(new MarginPageTransformer(padding * 2));
                    mContainer.setPadding(0, /* top= */ 0, 0, /* bottom= */ 0);
                }
                mPageIndicator = itemView.findViewById(R.id.color_page_indicator);
                if (ColorProvider.themeStyleEnabled) {
                    mPageIndicator.setVisibility(VISIBLE);
@@ -541,8 +525,7 @@ public class ColorSectionController implements CustomizationSectionController<Co
            ColorOptionViewHolder(View itemView) {
                super(itemView);
                mContainer = itemView.findViewById(R.id.color_option_container);
                // Sets layout with margins for non multi-pane case to separate color options.
                if (!mIsMultiPane) {
                // Sets layout with margins to separate color options.
                final FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
                        mContainer.getLayoutParams());
                final int margin = itemView.getContext().getResources().getDimensionPixelSize(
@@ -553,4 +536,3 @@ public class ColorSectionController implements CustomizationSectionController<Co
        }
    }
}
}
+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ class ClockSettingsFragment : AppbarFragment() {
                        },
                    ),
                lifecycleOwner = this,
                offsetToStart = displayUtils.isOnWallpaperDisplay(activity),
                offsetToStart = displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(activity),
            )
            .show()

+4 −2
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ class ColorPickerFragment : AppbarFragment() {
                    },
                ),
            lifecycleOwner = this,
            offsetToStart = displayUtils.isOnWallpaperDisplay(requireActivity()),
            offsetToStart =
                displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),
        )
        ScreenPreviewBinder.bind(
            activity = requireActivity(),
@@ -136,7 +137,8 @@ class ColorPickerFragment : AppbarFragment() {
                    },
                ),
            lifecycleOwner = this,
            offsetToStart = displayUtils.isOnWallpaperDisplay(requireActivity()),
            offsetToStart =
                displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),
        )
        val darkModeToggleContainerView: FrameLayout =
            view.requireViewById(R.id.dark_mode_toggle_container)
+2 −1
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class GridFragment extends AppbarFragment {
    private final Callback mApplyGridCallback = new Callback() {
        @Override
        public void onSuccess() {
            mGridManager.fetchOptions(unused -> {}, true);
            Toast.makeText(getContext(), R.string.applied_grid_msg, Toast.LENGTH_SHORT).show();
            getActivity().overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
            getActivity().finish();
@@ -217,7 +218,7 @@ public class GridFragment extends AppbarFragment {
                mLoading.hide();
                mOptionsController = new OptionSelectorController<>(
                        mOptionsContainer, options, /* useGrid= */ false,
                        CheckmarkStyle.CENTER_CHANGE_COLOR_WHEN_NOT_SELECTED, 0);
                        CheckmarkStyle.CENTER_CHANGE_COLOR_WHEN_NOT_SELECTED);
                mOptionsController.initOptions(mGridManager);
                GridOption previouslySelectedOption = findEquivalent(options,
                        mGridOptionViewModel.getSelectedOption());
+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ class KeyguardQuickAffordancePickerFragment : AppbarFragment() {
            viewModel = viewModel,
            lifecycleOwner = this,
            offsetToStart =
                injector.getDisplayUtils(requireActivity()).isOnWallpaperDisplay(requireActivity())
                requireActivity().let {
                    injector.getDisplayUtils(it).isSingleDisplayOrUnfoldedHorizontalHinge(it)
                }
        )
        KeyguardQuickAffordancePickerBinder.bind(
            view = view,
Loading