Skip to content

GitLab

T
tangled
Commit bff28411 authored by Theresa Sullivan's avatar Theresa Sullivan Committed by Chromium LUCI CQ
Browse files
Options

Delete unused AppMenuIconRowFooter 

Left-over from bottom toolbar experiments.

Change-Id: Ie0f3e8e14b8c937f293aed25697c73a4b6f1b539
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2628317
Auto-Submit: Theresa  <twellington@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843520}
parent dc12ff7d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 134 deletions
chrome/android/chrome_java_sources.gni
View file @ bff28411
......@@ -68,7 +68,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/announcement/AnnouncementNotificationManager.java",
"java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
"java/src/org/chromium/chrome/browser/app/appmenu/AddToMenuItemViewBinder.java",
"java/src/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java",
"java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java",
"java/src/org/chromium/chrome/browser/app/appmenu/ChipViewMenuItemViewBinder.java",
"java/src/org/chromium/chrome/browser/app/appmenu/DividerLineMenuItemViewBinder.java",
......
chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java deleted 100644 → 0
View file @ dc12ff7d
// Copyright 2018 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.
package org.chromium.chrome.browser.app.appmenu;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.graphics.drawable.DrawableCompat;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
import org.chromium.chrome.browser.download.DownloadUtils;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
/**
* A {@link LinearLayout} that displays a horizontal row of icons for page actions.
*/
public class AppMenuIconRowFooter extends LinearLayout implements View.OnClickListener {
private AppMenuHandler mAppMenuHandler;
private AppMenuDelegate mAppMenuDelegate;
private ImageButton mForwardButton;
private ImageButton mBookmarkButton;
private ImageButton mDownloadButton;
private ImageButton mPageInfoButton;
private ImageButton mReloadButton;
public AppMenuIconRowFooter(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
protected void onFinishInflate() {
super.onFinishInflate();
mForwardButton = findViewById(R.id.forward_menu_id);
mForwardButton.setOnClickListener(this);
mBookmarkButton = findViewById(R.id.bookmark_this_page_id);
mBookmarkButton.setOnClickListener(this);
mDownloadButton = findViewById(R.id.offline_page_id);
mDownloadButton.setOnClickListener(this);
mPageInfoButton = findViewById(R.id.info_menu_id);
mPageInfoButton.setOnClickListener(this);
mReloadButton = findViewById(R.id.reload_menu_id);
mReloadButton.setOnClickListener(this);
// ImageView tinting doesn't work with LevelListDrawable, use Drawable tinting instead.
// See https://crbug.com/891593 for details.
Drawable icon = AppCompatResources.getDrawable(getContext(), R.drawable.btn_reload_stop);
DrawableCompat.setTintList(icon,
AppCompatResources.getColorStateList(
getContext(), R.color.default_icon_color_tint_list));
mReloadButton.setImageDrawable(icon);
}
/**
* Initializes the icons, setting enabled state, drawables, and content descriptions.
* @param appMenuHandler The {@link AppMenu} that contains the icon row.
* @param bookmarkBridge The {@link BookmarkBridge} used to retrieve information about
* bookmarks.
* @param currentTab The current activity {@link Tab}.
* @param appMenuDelegate The AppMenuDelegate to handle options item selection.
*/
public void initialize(AppMenuHandler appMenuHandler, BookmarkBridge bookmarkBridge,
Tab currentTab, AppMenuDelegate appMenuDelegate) {
mAppMenuHandler = appMenuHandler;
mAppMenuDelegate = appMenuDelegate;
mForwardButton.setEnabled(currentTab.canGoForward());
updateBookmarkMenuItem(bookmarkBridge, currentTab);
mDownloadButton.setEnabled(DownloadUtils.isAllowedToDownloadPage(currentTab));
loadingStateChanged(currentTab.isLoading());
}
@Override
public void onClick(View v) {
mAppMenuDelegate.onOptionsItemSelected(v.getId(), null);
mAppMenuHandler.hideAppMenu();
}
/**
* Called when the current tab's load state has changed.
* @param isLoading Whether the tab is currently loading.
*/
public void loadingStateChanged(boolean isLoading) {
mReloadButton.getDrawable().setLevel(isLoading
? getResources().getInteger(R.integer.reload_button_level_stop)
: getResources().getInteger(R.integer.reload_button_level_reload));
mReloadButton.setContentDescription(isLoading
? getContext().getString(R.string.accessibility_btn_stop_loading)
: getContext().getString(R.string.accessibility_btn_refresh));
}
private void updateBookmarkMenuItem(BookmarkBridge bookmarkBridge, Tab currentTab) {
mBookmarkButton.setEnabled(bookmarkBridge.isEditBookmarksEnabled());
if (bookmarkBridge.hasBookmarkIdForTab(currentTab)) {
mBookmarkButton.setImageResource(R.drawable.btn_star_filled);
mBookmarkButton.setContentDescription(getContext().getString(R.string.edit_bookmark));
ApiCompatibilityUtils.setImageTintList(mBookmarkButton,
AppCompatResources.getColorStateList(getContext(), R.color.blue_mode_tint));
} else {
mBookmarkButton.setImageResource(R.drawable.btn_star);
mBookmarkButton.setContentDescription(
getContext().getString(R.string.accessibility_menu_bookmark));
}
}
}
chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
View file @ bff28411
......@@ -11,7 +11,6 @@ import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter;
import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
......@@ -59,13 +58,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
}
@Override
public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {
if (view instanceof AppMenuIconRowFooter) {
((AppMenuIconRowFooter) view)
.initialize(appMenuHandler, mBookmarkBridge, mActivityTabProvider.get(),
mAppMenuDelegate);
}
}
public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) {}
@Override
public int getHeaderResourceId() {
......
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