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

Commit 6da39af3 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Have nav bar handle density changes"

parents 093b3f1b 67a1cce2

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java

+22 −6
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.widget.FrameLayout; 
import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.Space;



import com.android.systemui.R;

import com.android.systemui.statusbar.policy.KeyButtonView;

import com.android.systemui.tuner.TunerService;
@@ -58,8 +57,9 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi 
    public static final String KEY_IMAGE_DELIM = ":";

    public static final String KEY_CODE_END = ")";



    protected final LayoutInflater mLayoutInflater;

    protected final LayoutInflater mLandscapeInflater;

    protected LayoutInflater mLayoutInflater;

    protected LayoutInflater mLandscapeInflater;

    private int mDensity;



    protected FrameLayout mRot0;

    protected FrameLayout mRot90;
@@ -69,11 +69,27 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi 


    public NavigationBarInflaterView(Context context, AttributeSet attrs) {

        super(context, attrs);

        mLayoutInflater = LayoutInflater.from(context);

        mDensity = context.getResources().getConfiguration().densityDpi;

        createInflaters();

    }



    private void createInflaters() {

        mLayoutInflater = LayoutInflater.from(mContext);

        Configuration landscape = new Configuration();

        landscape.setTo(context.getResources().getConfiguration());

        landscape.setTo(mContext.getResources().getConfiguration());

        landscape.orientation = Configuration.ORIENTATION_LANDSCAPE;

        mLandscapeInflater = LayoutInflater.from(context.createConfigurationContext(landscape));

        mLandscapeInflater = LayoutInflater.from(mContext.createConfigurationContext(landscape));

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        if (mDensity != newConfig.densityDpi) {

            mDensity = newConfig.densityDpi;

            createInflaters();

            clearViews();

            inflateLayout(mCurrentLayout);

        }

    }



    @Override