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

Commit 877918c7 authored by yyalan's avatar yyalan
Browse files

PSS: AppSelector's should update its width when unfold 

Update the maxWidth so that it respects config change

Fixes: 297507829
Test: TODO: Screenshot tests are currently disabled; E2e tests will be done with follow up bug
Test: Manual: Start AppSelector, unfold, then check with hsv
Change-Id: Iffa074dbda877cc99949b346d5598f1a7f6dc0ca
parent a0e3d97e

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

+19 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.content.res.Resources.ID_NULL; 


import android.annotation.IdRes;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Rect;
@@ -53,10 +54,13 @@ public class ResolverDrawerLayout extends ViewGroup { 
    private static final String TAG = "ResolverDrawerLayout";

    private MetricsLogger mMetricsLogger;







    /**

     * Max width of the whole drawer layout

     * Max width of the whole drawer layout and its res id

     */

    private final int mMaxWidth;

    private int mMaxWidthResId;

    private int mMaxWidth;



    /**

     * Max total visible height of views not marked always-show when in the closed/initial state
@@ -152,6 +156,7 @@ public class ResolverDrawerLayout extends ViewGroup { 


        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ResolverDrawerLayout,

                defStyleAttr, 0);

        mMaxWidthResId = a.getResourceId(R.styleable.ResolverDrawerLayout_maxWidth, -1);

        mMaxWidth = a.getDimensionPixelSize(R.styleable.ResolverDrawerLayout_maxWidth, -1);

        mMaxCollapsedHeight = a.getDimensionPixelSize(

                R.styleable.ResolverDrawerLayout_maxCollapsedHeight, 0);
@@ -1042,6 +1047,18 @@ public class ResolverDrawerLayout extends ViewGroup { 
        return mAlwaysShowHeight;

    }



    /**

     * Max width of the drawer needs to be updated after the configuration is changed.

     * For example, foldables have different layout width when the device is folded and unfolded.

     */

    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        if (mMaxWidthResId > 0) {

            mMaxWidth = getResources().getDimensionPixelSize(mMaxWidthResId);

        }

    }



    @Override

    protected void onLayout(boolean changed, int l, int t, int r, int b) {

        final int width = getWidth();