commit e40d7a632668a3813a443195ba8e2146407a0517
author Abodunrinwa Toki <toki@google.com> Tue Jun 30 16:56:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 30 16:56:23 2015 +0000
tree cde10ae2bcbaee9ca101b591b26fa5735d96d756
parent 685a14468eeb730d19a36ac20bda75fe968feddb
parent 8747f37383c41805800d208c8a4ebeeebeddf2dc

Merge "Fix Floating toolbar overflow width." into mnc-dev

core/java/com/android/internal/widget/FloatingToolbar.java

diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java
index 163b8ce..a6e8034 100644
--- a/core/java/com/android/internal/widget/FloatingToolbar.java
+++ b/core/java/com/android/internal/widget/FloatingToolbar.java
@@ -1135,7 +1135,7 @@
         private final Runnable mCloseOverflow;
 
         private MenuItem.OnMenuItemClickListener mOnMenuItemClickListener;
-        private int mOverflowWidth = 0;
+        private int mOverflowWidth;
         private int mSuggestedHeight;
 
         /**
@@ -1146,7 +1146,6 @@
          */
         public FloatingToolbarOverflowPanel(Context context, Runnable closeOverflow) {
             mCloseOverflow = Preconditions.checkNotNull(closeOverflow);
-            mSuggestedHeight = getScreenHeight(context);
 
             mContentView = new LinearLayout(context);
             mContentView.setOrientation(LinearLayout.VERTICAL);
@@ -1270,7 +1269,8 @@
             mListView.setLayoutParams(params);
         }
 
-        private int setOverflowWidth() {
+        private void setOverflowWidth() {
+            mOverflowWidth = 0;
             for (int i = 0; i < mListView.getAdapter().getCount(); i++) {
                 MenuItem menuItem = (MenuItem) mListView.getAdapter().getItem(i);
                 Preconditions.checkNotNull(menuItem);
@@ -1280,7 +1280,6 @@
                 mOverflowWidth = Math.max(
                         mListViewItemWidthCalculator.getMeasuredWidth(), mOverflowWidth);
             }
-            return mOverflowWidth;
         }
 
         private ListView createOverflowListView() {
@@ -1505,18 +1504,4 @@
         return context.getResources()
                 .getDimensionPixelSize(R.dimen.floating_toolbar_menu_button_minimum_width);
     }
-
-    /**
-     * Returns the device's screen width.
-     */
-    private static int getScreenWidth(Context context) {
-        return context.getResources().getDisplayMetrics().widthPixels;
-    }
-
-    /**
-     * Returns the device's screen height.
-     */
-    private static int getScreenHeight(Context context) {
-        return context.getResources().getDisplayMetrics().heightPixels;
-    }
 }