Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0468a570: am e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev

Browse Source 
* commit '0468a5700e2c0112d908fac3d791477192c91a81':
  Fix Floating toolbar overflow width.
This commit is contained in:
Abodunrinwa Toki
2015-06-30 17:23:46 +00:00
committed by Android Git Automerger
parent 3e26dcb550 0468a5700e
commit 0707edf1a8
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -1135,7 +1135,7 @@ public final class FloatingToolbar {
private final Runnable mCloseOverflow; private final Runnable mCloseOverflow;
private MenuItem.OnMenuItemClickListener mOnMenuItemClickListener; private MenuItem.OnMenuItemClickListener mOnMenuItemClickListener;
private int mOverflowWidth = 0; private int mOverflowWidth;
private int mSuggestedHeight; private int mSuggestedHeight;
/** /**
@@ -1146,7 +1146,6 @@ public final class FloatingToolbar {
*/ */
public FloatingToolbarOverflowPanel(Context context, Runnable closeOverflow) { public FloatingToolbarOverflowPanel(Context context, Runnable closeOverflow) {
mCloseOverflow = Preconditions.checkNotNull(closeOverflow); mCloseOverflow = Preconditions.checkNotNull(closeOverflow);
mSuggestedHeight = getScreenHeight(context);
mContentView = new LinearLayout(context); mContentView = new LinearLayout(context);
mContentView.setOrientation(LinearLayout.VERTICAL); mContentView.setOrientation(LinearLayout.VERTICAL);
@@ -1270,7 +1269,8 @@ public final class FloatingToolbar {
mListView.setLayoutParams(params); mListView.setLayoutParams(params);
} }
private int setOverflowWidth() { private void setOverflowWidth() {
mOverflowWidth = 0;
for (int i = 0; i < mListView.getAdapter().getCount(); i++) { for (int i = 0; i < mListView.getAdapter().getCount(); i++) {
MenuItem menuItem = (MenuItem) mListView.getAdapter().getItem(i); MenuItem menuItem = (MenuItem) mListView.getAdapter().getItem(i);
Preconditions.checkNotNull(menuItem); Preconditions.checkNotNull(menuItem);
@@ -1280,7 +1280,6 @@ public final class FloatingToolbar {
mOverflowWidth = Math.max( mOverflowWidth = Math.max(
mListViewItemWidthCalculator.getMeasuredWidth(), mOverflowWidth); mListViewItemWidthCalculator.getMeasuredWidth(), mOverflowWidth);
} }
return mOverflowWidth;
} }
private ListView createOverflowListView() { private ListView createOverflowListView() {
@@ -1505,18 +1504,4 @@ public final class FloatingToolbar {
return context.getResources() return context.getResources()
.getDimensionPixelSize(R.dimen.floating_toolbar_menu_button_minimum_width); .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;
}
} }