Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1476)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java

Issue 2753773006: [Home] Move bottom sheet classes to widget/bottomsheet (Closed)
Patch Set: Fix bottom_sheet_bottom_nav.xml Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
similarity index 98%
rename from chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.java
rename to chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
index c1f73b8fda59a5d8c8cceeabd0423e06777ed0f0..6549ec5fe1feca81f3b860b7d38edc3b3ba23241 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.chrome.browser.widget;
+package org.chromium.chrome.browser.widget.bottomsheet;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModel;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.util.MathUtils;
+import org.chromium.chrome.browser.widget.FadingBackgroundView;
import org.chromium.content_public.browser.LoadUrlParams;
import java.lang.annotation.Retention;
@@ -194,8 +195,7 @@ public class BottomSheet
}
@Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
- float distanceY) {
+ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
// Only start scrolling if the scroll is up or down. If the user is already scrolling,
// continue moving the sheet.
float slope = Math.abs(distanceX) > 0f ? Math.abs(distanceY) / Math.abs(distanceX) : 0f;
@@ -243,8 +243,7 @@ public class BottomSheet
}
@Override
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
- float velocityY) {
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
cancelAnimation();
// Figure out the projected state of the sheet and animate there. Note that a swipe up
@@ -589,8 +588,8 @@ public class BottomSheet
*/
private void createSettleAnimation(@SheetState int targetState) {
mCurrentState = targetState;
- mSettleAnimator = ValueAnimator.ofFloat(getSheetOffsetFromBottom(),
- getSheetHeightForState(targetState));
+ mSettleAnimator = ValueAnimator.ofFloat(
+ getSheetOffsetFromBottom(), getSheetHeightForState(targetState));
mSettleAnimator.setDuration(BASE_ANIMATION_DURATION_MS);
mSettleAnimator.setInterpolator(mInterpolator);

Powered by Google App Engine
This is Rietveld 408576698