Commit 5d1d994c authored by Matthew Jones's avatar Matthew Jones Committed by Commit Bot

Revert "Revert "[Home] Separate swipe detecting logic from the bottom sheet""

This reverts commit cf0d7c2a.

Reason for revert: Fix interface impl bug

Original change's description:
[Home] Separate swipe detecting logic from the bottom sheet

This change moves all of the swipe detecting from the bottom sheet
into its own class. A relatively simple interface has been introduced
to prevent needing the entire bottom sheet to detect swipes.

BUG=

TBR=tedchoc@chromium.org

Change-Id: Ie77d5c2bcec7874787bd23bf347c6abd8716b492
Reviewed-on: https://chromium-review.googlesource.com/812466Reviewed-by: default avatarTheresa <twellington@chromium.org>
Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522271}
parent 7c7112f1
...@@ -110,7 +110,7 @@ public class BottomSheetContentController ...@@ -110,7 +110,7 @@ public class BottomSheetContentController
float offsetY = mBottomSheet.getSheetHeightForState(mBottomSheet.isSmallScreen() float offsetY = mBottomSheet.getSheetHeightForState(mBottomSheet.isSmallScreen()
? BottomSheet.SHEET_STATE_FULL ? BottomSheet.SHEET_STATE_FULL
: BottomSheet.SHEET_STATE_HALF) : BottomSheet.SHEET_STATE_HALF)
- mBottomSheet.getSheetOffsetFromBottom(); - mBottomSheet.getCurrentOffsetPx();
setTranslationY(Math.max(offsetY, 0f)); setTranslationY(Math.max(offsetY, 0f));
if (mBottomSheet.getTargetSheetState() != BottomSheet.SHEET_STATE_PEEK if (mBottomSheet.getTargetSheetState() != BottomSheet.SHEET_STATE_PEEK
......
...@@ -1363,6 +1363,7 @@ chrome_java_sources = [ ...@@ -1363,6 +1363,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/widget/animation/CancelAwareAnimatorListener.java", "java/src/org/chromium/chrome/browser/widget/animation/CancelAwareAnimatorListener.java",
"java/src/org/chromium/chrome/browser/widget/animation/FocusAnimator.java", "java/src/org/chromium/chrome/browser/widget/animation/FocusAnimator.java",
"java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java",
"java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetector.java",
"java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetContentController.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetContentController.java",
"java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetMetrics.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetMetrics.java",
"java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetNavigationItemView.java", "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetNavigationItemView.java",
...@@ -1981,6 +1982,7 @@ chrome_junit_test_java_sources = [ ...@@ -1981,6 +1982,7 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java", "junit/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java",
"junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java", "junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java",
"junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java", "junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java",
"junit/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetectorTest.java",
"junit/src/org/chromium/chrome/browser/widget/selection/SelectionDelegateTest.java", "junit/src/org/chromium/chrome/browser/widget/selection/SelectionDelegateTest.java",
] ]
......
mdjones@chromium.org
twellington@chromium.org
# COMPONENT: UI>Browser>Mobile>NavPanel
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment