summaryrefslogtreecommitdiff
path: root/src/com/android
diff options
context:
space:
mode:
authorKunhung Li <kunhungli@google.com>2022-04-18 01:28:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-04-18 01:28:43 +0000
commitae401d3231122770721c4285b774b60375820016 (patch)
treeaf524d0674e08434bce7788bb51f63da844dc788 /src/com/android
parent6846823260656d7b5576d06099d65d1b4738c39a (diff)
parent52b0a3eaca446ce5b75f3fa0b066a36fc55834bd (diff)
downloadThemePicker-ae401d3231122770721c4285b774b60375820016.tar.gz
Merge "Fix scrolling goes under the expanded action bar" into tm-dev
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/customization/model/color/ColorSectionController.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/customization/model/color/ColorSectionController.java b/src/com/android/customization/model/color/ColorSectionController.java
index 4c163e65..ac346dd9 100644
--- a/src/com/android/customization/model/color/ColorSectionController.java
+++ b/src/com/android/customization/model/color/ColorSectionController.java
@@ -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