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

Commit 6a01fe49 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Measure WidgetsFullSheet before estimating the recommended table size" into sc-dev

parents 1b3f5d38 a606d344

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+8 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.launcher3.widget.picker;



import static android.view.View.MeasureSpec.makeMeasureSpec;



import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_SEARCHED;

import static com.android.launcher3.testing.TestProtocol.NORMAL_STATE_ORDINAL;
@@ -519,7 +521,12 @@ public class WidgetsFullSheet extends BaseWidgetSheet 
                                mNoWidgetsView.getText().length(), noWidgetsViewTextBounds);

                noWidgetsViewHeight = noWidgetsViewTextBounds.height();

            }

            float maxTableHeight = (mActivityContext.getDeviceProfile().availableHeightPx

            doMeasure(

                    makeMeasureSpec(mActivityContext.getDeviceProfile().availableWidthPx,

                            MeasureSpec.EXACTLY),

                    makeMeasureSpec(mActivityContext.getDeviceProfile().availableHeightPx,

                            MeasureSpec.EXACTLY));

            float maxTableHeight = (mContent.getMeasuredHeight()

                    - mTabsHeight - mViewPagerTopPadding - getHeaderViewHeight()

                    - noWidgetsViewHeight) * RECOMMENDATION_TABLE_HEIGHT_RATIO;