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

Commit f9ba53eb authored by Kunhung Li's avatar Kunhung Li Committed by Automerger Merge Worker
Browse files

Merge "Fix scrolling goes under the expanded action bar" into tm-dev am: ae401d32 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/17764700



Change-Id: Ic12b248df2d1ac4478eda4b75adbf042acea85ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6a4d74f ae401d32

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

+2 −0
Original line number Diff line number Diff line
@@ -427,6 +427,8 @@ public class ColorSectionController implements CustomizationSectionController<Co 
            ColorPageViewHolder(View itemView) {

                super(itemView);

                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