Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8747f373 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki
Browse files

Fix Floating toolbar overflow width. 

Also clean out unused methods.

Bug: 22186458
Change-Id: I5ef03cd7938630c0d607b6fecd540f2bd83bbb65
parent b6e00137

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

+3 −18
Original line number Original line Diff line number Diff line
@@ -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;

    }

}
 
}