Commit 5421f48f authored by Colin Blundell's avatar Colin Blundell Committed by Commit Bot

[Banners] Componentize SwipableOverlayView.java

This class will be reused in WebLayer's infobars implementation. Banners
conceptually fit well within the purpose of //components/browser_ui,
and so we move it there.

Bug: 1099169
Change-Id: I441d8e1ef310be47bca1bda8ac6c015bd96ca172
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274503Reviewed-by: default avatarBo <boliu@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783919}
parent 22c14809
...@@ -357,6 +357,7 @@ android_library("chrome_java") { ...@@ -357,6 +357,7 @@ android_library("chrome_java") {
"//components/browser_ui/android/bottomsheet:factory_java", "//components/browser_ui/android/bottomsheet:factory_java",
"//components/browser_ui/android/bottomsheet:java", "//components/browser_ui/android/bottomsheet:java",
"//components/browser_ui/android/bottomsheet:manager_java", "//components/browser_ui/android/bottomsheet:manager_java",
"//components/browser_ui/banners/android:java",
"//components/browser_ui/client_certificate/android:java", "//components/browser_ui/client_certificate/android:java",
"//components/browser_ui/http_auth/android:java", "//components/browser_ui/http_auth/android:java",
"//components/browser_ui/media/android:java", "//components/browser_ui/media/android:java",
......
...@@ -13,6 +13,7 @@ include_rules = [ ...@@ -13,6 +13,7 @@ include_rules = [
"+chrome/browser/util/android/java", "+chrome/browser/util/android/java",
"+chrome/browser/xsurface/android", "+chrome/browser/xsurface/android",
"+components/browser_ui/android/bottomsheet", "+components/browser_ui/android/bottomsheet",
"+components/browser_ui/banners/android",
"+components/browser_ui/media/android", "+components/browser_ui/media/android",
"+components/browser_ui/modaldialog/android", "+components/browser_ui/modaldialog/android",
"+components/browser_ui/share/android", "+components/browser_ui/share/android",
......
...@@ -133,7 +133,6 @@ chrome_java_sources = [ ...@@ -133,7 +133,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/banners/AppBannerManager.java", "java/src/org/chromium/chrome/browser/banners/AppBannerManager.java",
"java/src/org/chromium/chrome/browser/banners/AppData.java", "java/src/org/chromium/chrome/browser/banners/AppData.java",
"java/src/org/chromium/chrome/browser/banners/AppDetailsDelegate.java", "java/src/org/chromium/chrome/browser/banners/AppDetailsDelegate.java",
"java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java",
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java", "java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java",
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java", "java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java",
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddActivity.java", "java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddActivity.java",
......
...@@ -15,9 +15,9 @@ import android.widget.FrameLayout; ...@@ -15,9 +15,9 @@ import android.widget.FrameLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.banners.SwipableOverlayView;
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
import org.chromium.chrome.browser.browser_controls.BrowserControlsUtils; import org.chromium.chrome.browser.browser_controls.BrowserControlsUtils;
import org.chromium.components.browser_ui.banners.SwipableOverlayView;
import org.chromium.components.infobars.InfoBar; import org.chromium.components.infobars.InfoBar;
import org.chromium.components.infobars.InfoBarUiItem; import org.chromium.components.infobars.InfoBarUiItem;
import org.chromium.ui.display.DisplayAndroid; import org.chromium.ui.display.DisplayAndroid;
......
# Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/android/rules.gni")
android_library("java") {
sources = [ "java/src/org/chromium/components/browser_ui/banners/SwipableOverlayView.java" ]
deps = [
"//base:base_java",
"//content/public/android:content_java",
"//third_party/android_deps:androidx_appcompat_appcompat_java",
]
}
include_rules = [
"-content/public/android",
"+content/public/android/java/src/org/chromium/content_public",
]
file://chrome/android/java/src/org/chromium/chrome/browser/banners/OWNERS
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.chrome.browser.banners; package org.chromium.components.browser_ui.banners;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
...@@ -233,8 +233,8 @@ public abstract class SwipableOverlayView extends FrameLayout { ...@@ -233,8 +233,8 @@ public abstract class SwipableOverlayView extends FrameLayout {
boolean isVisibleInitially = mInitialTranslationY < mTotalHeight; boolean isVisibleInitially = mInitialTranslationY < mTotalHeight;
float percentageVisible = 1.0f - (getTranslationY() / mTotalHeight); float percentageVisible = 1.0f - (getTranslationY() / mTotalHeight);
float visibilityThreshold = isVisibleInitially float visibilityThreshold = isVisibleInitially ? VERTICAL_FLING_HIDE_THRESHOLD
? VERTICAL_FLING_HIDE_THRESHOLD : VERTICAL_FLING_SHOW_THRESHOLD; : VERTICAL_FLING_SHOW_THRESHOLD;
boolean isVisibleEnough = percentageVisible > visibilityThreshold; boolean isVisibleEnough = percentageVisible > visibilityThreshold;
boolean isNearTopOfPage = scrollOffsetY < (mTotalHeight * FULL_THRESHOLD); boolean isNearTopOfPage = scrollOffsetY < (mTotalHeight * FULL_THRESHOLD);
......
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