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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.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/appmenu/AppMenu.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java
index 065f2df0137c210a41bf234b7d1bc662b0c65806..7de210cf3f43503abb5aa932f1c04f76ff3c9744 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java
@@ -13,6 +13,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -59,6 +60,7 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
private ListPopupWindow mPopup;
private AppMenuAdapter mAdapter;
private AppMenuHandler mHandler;
+ private View mPromptView;
private int mCurrentScreenRotation = -1;
private boolean mIsByPermanentButton;
private AnimatorSet mMenuItemEnterAnimator;
@@ -159,11 +161,13 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
int footerHeight = 0;
if (footerResourceId != 0) {
mPopup.setPromptPosition(ListPopupWindow.POSITION_PROMPT_BELOW);
- View promptView = LayoutInflater.from(context).inflate(footerResourceId, null);
- mPopup.setPromptView(promptView);
+ mPromptView = LayoutInflater.from(context).inflate(footerResourceId, null);
+ mPopup.setPromptView(mPromptView);
int measureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
- promptView.measure(measureSpec, measureSpec);
- footerHeight = promptView.getMeasuredHeight();
+ mPromptView.measure(measureSpec, measureSpec);
+ footerHeight = mPromptView.getMeasuredHeight();
+ } else {
+ mPromptView = null;
}
mPopup.setOnDismissListener(new OnDismissListener() {
@Override
@@ -264,6 +268,14 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
}
}
+ /**
+ * @return The prompt view for the menu or null if one has not been set.
+ */
+ @Nullable
+ public View getPromptView() {
+ return mPromptView;
+ }
+
private boolean isAnchorAtBottom(View anchorView, Rect visibleDisplayFrame) {
anchorView.getLocationOnScreen(mTempLocation);
return (mTempLocation[1] + anchorView.getHeight()) == visibleDisplayFrame.bottom;

Powered by Google App Engine
This is Rietveld 408576698