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

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

Issue 2807123003: Fix menu sizing for data saver footer. (Closed)
Patch Set: Fix strictmode violation when showing data reduction promo 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 1f510187aba03f52850549630a5397c056530e6b..0705da20b916b08827584b73b4be0b9c1464ab37 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1268,11 +1268,23 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
@Override
protected AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {
return new AppMenuPropertiesDelegate(this) {
+ private boolean showDataSaverFooter() {
+ return DataReductionProxySettings.getInstance()
+ .shouldUseDataReductionMainMenuItem();
+ }
+
@Override
public int getFooterResourceId() {
- return DataReductionProxySettings.getInstance().shouldUseDataReductionMainMenuItem()
- ? R.layout.data_reduction_main_menu_footer
- : 0;
+ return showDataSaverFooter() ? R.layout.data_reduction_main_menu_footer : 0;
+ }
+
+ @Override
+ public boolean shouldShowFooter(int maxMenuHeight) {
+ if (showDataSaverFooter()) {
+ return maxMenuHeight >= getResources().getDimension(
+ R.dimen.data_saver_menu_footer_min_show_height);
+ }
+ return super.shouldShowFooter(maxMenuHeight);
}
};
}
« no previous file with comments | « chrome/android/java/res/values/dimens.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698