Skip to content

GitLab

T
tangled
Commit 4eb1f308 authored by Pedro Amaral's avatar Pedro Amaral Committed by Commit Bot
Browse files
Options

Making bottom toolbar package 

Moving bottom toolbar classes to a new package called:

org.chromium.chrome.browser.toolbar.bottom;

Bug: 904997
Change-Id: Ibd552668fd2c2711b4403293a8e39e40d2098e29
Reviewed-on: https://chromium-review.googlesource.com/c/1335029Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608177}
parent 93c6800e
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 39 deletions
chrome/android/java/res/layout/bottom_toolbar_browsing.xml
View file @ 4eb1f308
......@@ -3,7 +3,7 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<org.chromium.chrome.browser.toolbar.ScrollingBottomViewResourceFrameLayout
<org.chromium.chrome.browser.toolbar.bottom.ScrollingBottomViewResourceFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
......@@ -37,14 +37,14 @@
android:paddingStart="@dimen/bottom_toolbar_start_padding"
android:paddingEnd="@dimen/bottom_toolbar_end_padding" >
<org.chromium.chrome.browser.toolbar.HomeButton
<org.chromium.chrome.browser.toolbar.bottom.HomeButton
android:id="@+id/home_button"
style="@style/BottomToolbarButton"
android:contentDescription="@string/accessibility_toolbar_btn_home" />
<include layout="@layout/toolbar_space" />
<org.chromium.chrome.browser.toolbar.ShareButton
<org.chromium.chrome.browser.toolbar.bottom.ShareButton
android:id="@+id/share_button"
style="@style/BottomToolbarButton"
android:src="@drawable/ic_share_white_24dp"
......@@ -53,7 +53,7 @@
<include layout="@layout/toolbar_space" />
<org.chromium.chrome.browser.toolbar.SearchAccelerator
<org.chromium.chrome.browser.toolbar.bottom.SearchAccelerator
android:id="@+id/search_accelerator"
android:layout_width="@dimen/search_accelerator_width"
android:layout_height="@dimen/search_accelerator_height"
......@@ -78,4 +78,4 @@
</org.chromium.chrome.browser.widget.bottomsheet.TouchRestrictingFrameLayout>
</org.chromium.chrome.browser.toolbar.ScrollingBottomViewResourceFrameLayout>
</org.chromium.chrome.browser.toolbar.bottom.ScrollingBottomViewResourceFrameLayout>
chrome/android/java/src/org/chromium/chrome/browser/toolbar/MenuButton.java
View file @ 4eb1f308
......@@ -48,7 +48,7 @@ public class MenuButton extends FrameLayout implements ThemeColorObserver {
* @param onTouchListener An {@link OnTouchListener} that is triggered when the menu button is
* clicked.
*/
void setTouchListener(OnTouchListener onTouchListener) {
public void setTouchListener(OnTouchListener onTouchListener) {
mMenuImageButton.setOnTouchListener(onTouchListener);
}
......@@ -113,7 +113,7 @@ public class MenuButton extends FrameLayout implements ThemeColorObserver {
/**
* @return Whether the update badge is showing.
*/
boolean isShowingAppMenuUpdateBadge() {
public boolean isShowingAppMenuUpdateBadge() {
return mUpdateBadgeView.getVisibility() == View.VISIBLE;
}
......@@ -149,7 +149,7 @@ public class MenuButton extends FrameLayout implements ThemeColorObserver {
return mMenuImageButton;
}
void setThemeColorProvider(ThemeColorProvider themeColorProvider) {
public void setThemeColorProvider(ThemeColorProvider themeColorProvider) {
mThemeColorProvider = themeColorProvider;
mThemeColorProvider.addObserver(this);
}
......@@ -160,7 +160,7 @@ public class MenuButton extends FrameLayout implements ThemeColorObserver {
setUseLightDrawables(ColorUtils.shouldUseLightForegroundOnBackground(primaryColor));
}
void destroy() {
public void destroy() {
if (mThemeColorProvider != null) {
mThemeColorProvider.removeObserver(this);
mThemeColorProvider = null;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabCountProvider.java
View file @ 4eb1f308
......@@ -15,9 +15,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabModelObserver;
import java.util.List;
/**
* Provides the number of open regular tabs for display in the tab switcher icon.
*/
/** A provider that notifies its observers when the number of tabs changes. */
public class TabCountProvider {
/** An observer that is notified of changes to the number of open tabs. */
public interface TabCountObserver {
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
View file @ 4eb1f308
......@@ -88,6 +88,7 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
import org.chromium.chrome.browser.tabmodel.TabModelObserver;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarCoordinator;
import org.chromium.chrome.browser.toolbar.top.ActionModeController;
import org.chromium.chrome.browser.toolbar.top.ActionModeController.ActionBarDelegate;
import org.chromium.chrome.browser.toolbar.top.Toolbar;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarCoordinator.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.view.View;
import android.view.View.OnClickListener;
......@@ -16,6 +16,9 @@ import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.compositor.layouts.ToolbarSwipeLayout;
import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.toolbar.IncognitoStateProvider;
import org.chromium.chrome.browser.toolbar.MenuButton;
import org.chromium.chrome.browser.toolbar.TabCountProvider;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.resources.ResourceManager;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarCoordinator.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.view.View;
import android.view.View.OnClickListener;
......@@ -19,7 +19,11 @@ import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
import org.chromium.chrome.browser.modelutil.PropertyModelChangeProcessor;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.toolbar.BrowsingModeBottomToolbarViewBinder.ViewHolder;
import org.chromium.chrome.browser.toolbar.MenuButton;
import org.chromium.chrome.browser.toolbar.TabCountProvider;
import org.chromium.chrome.browser.toolbar.TabSwitcherButtonCoordinator;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider;
import org.chromium.chrome.browser.toolbar.bottom.BrowsingModeBottomToolbarViewBinder.ViewHolder;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.resources.ResourceManager;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarMediator.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.content.res.ColorStateList;
import android.content.res.Resources;
......@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.compositor.layouts.ToolbarSwipeLayout;
import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager.FullscreenListener;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver;
import org.chromium.chrome.browser.widget.textbubble.TextBubble;
import org.chromium.components.feature_engagement.FeatureConstants;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarModel.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
import org.chromium.chrome.browser.compositor.layouts.ToolbarSwipeLayout;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarViewBinder.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.view.View;
import android.view.ViewGroup;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/HomeButton.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/HomeButton.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.content.Context;
import android.content.res.ColorStateList;
......@@ -11,6 +11,7 @@ import android.util.AttributeSet;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.ui.widget.ChromeImageButton;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ScrollingBottomViewResourceFrameLayout.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.content.Context;
import android.graphics.Canvas;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/SearchAccelerator.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.content.Context;
import android.content.res.ColorStateList;
......@@ -13,6 +13,7 @@ import android.util.AttributeSet;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver;
import org.chromium.chrome.browser.util.ColorUtils;
import org.chromium.ui.widget.ChromeImageButton;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ShareButton.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.content.Context;
import android.content.res.ColorStateList;
......@@ -15,6 +15,7 @@ import org.chromium.chrome.browser.UrlConstants;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver;
import org.chromium.ui.widget.ChromeImageButton;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarCoordinator.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.view.View;
import android.view.View.OnClickListener;
......@@ -15,6 +15,11 @@ import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.device.DeviceClassManager;
import org.chromium.chrome.browser.modelutil.PropertyModelChangeProcessor;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.toolbar.IncognitoStateProvider;
import org.chromium.chrome.browser.toolbar.IncognitoToggleTabLayout;
import org.chromium.chrome.browser.toolbar.MenuButton;
import org.chromium.chrome.browser.toolbar.NewTabButton;
import org.chromium.chrome.browser.toolbar.TabCountProvider;
/**
* The coordinator for the tab switcher mode bottom toolbar. This class handles all interactions
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarMediator.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java
View file @ 4eb1f308
......@@ -2,12 +2,13 @@
// 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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.content.res.ColorStateList;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.OverviewModeObserver;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider;
import org.chromium.chrome.browser.toolbar.ThemeColorProvider.ThemeColorObserver;
/**
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarModel.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import org.chromium.chrome.browser.modelutil.PropertyModel;
......
chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarViewBinder.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java
View file @ 4eb1f308
......@@ -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.toolbar;
package org.chromium.chrome.browser.toolbar.bottom;
import android.view.View;
......
chrome/android/java_sources.gni
View file @ 4eb1f308
......@@ -1565,27 +1565,14 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/tabmodel/document/StorageDelegate.java",
"java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java",
"java/src/org/chromium/chrome/browser/tasks/TasksUma.java",
"java/src/org/chromium/chrome/browser/toolbar/BottomToolbarCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarMediator.java",
"java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarModel.java",
"java/src/org/chromium/chrome/browser/toolbar/BrowsingModeBottomToolbarViewBinder.java",
"java/src/org/chromium/chrome/browser/toolbar/HomePageButton.java",
"java/src/org/chromium/chrome/browser/toolbar/HomeButton.java",
"java/src/org/chromium/chrome/browser/toolbar/IncognitoStateProvider.java",
"java/src/org/chromium/chrome/browser/toolbar/IncognitoToggleTabLayout.java",
"java/src/org/chromium/chrome/browser/toolbar/KeyboardNavigationListener.java",
"java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java",
"java/src/org/chromium/chrome/browser/toolbar/MenuButton.java",
"java/src/org/chromium/chrome/browser/toolbar/NewTabButton.java",
"java/src/org/chromium/chrome/browser/toolbar/ScrollingBottomViewResourceFrameLayout.java",
"java/src/org/chromium/chrome/browser/toolbar/SearchAccelerator.java",
"java/src/org/chromium/chrome/browser/toolbar/ShareButton.java",
"java/src/org/chromium/chrome/browser/toolbar/TabCountProvider.java",
"java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarMediator.java",
"java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarModel.java",
"java/src/org/chromium/chrome/browser/toolbar/TabSwitcherBottomToolbarViewBinder.java",
"java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonViewBinder.java",
"java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonProperties.java",
......@@ -1596,6 +1583,19 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java",
"java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java",
"java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/HomeButton.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewResourceFrameLayout.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java",
"java/src/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarViewBinder.java",
"java/src/org/chromium/chrome/browser/toolbar/top/ActionModeController.java",
"java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java",
"java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbarAnimationDelegate.java",
......
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