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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

Issue 2821223004: [Home] Show the app menu icons as a footer (Closed)
Patch Set: Changes from tedchoc@ review Created 3 years, 8 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/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index e7b6ff72e8b1a443f6c62612b971c5eba56f7a0b..3f6ff5f804110af2dbfc0eed14e1752ca42497a4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1265,12 +1265,18 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
protected AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {
return new AppMenuPropertiesDelegate(this) {
private boolean showDataSaverFooter() {
- return DataReductionProxySettings.getInstance()
- .shouldUseDataReductionMainMenuItem();
+ return getBottomSheet() == null
+ && DataReductionProxySettings.getInstance()
+ .shouldUseDataReductionMainMenuItem();
}
@Override
public int getFooterResourceId() {
+ if (getBottomSheet() != null) {
+ boolean isPageMenu = !isTablet() && !isInOverviewMode();
+ return isPageMenu ? R.layout.icon_row_menu_footer : 0;
+ }
+
return showDataSaverFooter() ? R.layout.data_reduction_main_menu_footer : 0;
}

Powered by Google App Engine
This is Rietveld 408576698