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

Commit 76323e41 authored by Danesh M's avatar Danesh M Committed by Gerrit Code Review
Browse files

NavigationBar : Switch to display orientation from config orientation 

Config orientation seems to incorrectly report states and causes
issues where incorrect view is shown. Switch to using display orientation
and in doing so, mirror aosp logic for view switching.

Change-Id: Ibfa07709ed5067b8d300fa61dc5ffe6579491918
parent c08411bb

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

+10 −7
Original line number Diff line number Diff line
@@ -570,9 +570,11 @@ public class NavigationBarView extends LinearLayout { 


    @Override

    public void onFinishInflate() {

        mRotatedViews[Configuration.ORIENTATION_PORTRAIT] = findViewById(R.id.rot0);

        mRotatedViews[Configuration.ORIENTATION_LANDSCAPE] = findViewById(R.id.rot90);

        mCurrentView = mRotatedViews[getResources().getConfiguration().orientation];

        mRotatedViews[Surface.ROTATION_0] =

                mRotatedViews[Surface.ROTATION_180] = findViewById(R.id.rot0);

        mRotatedViews[Surface.ROTATION_90] = findViewById(R.id.rot90);

        mRotatedViews[Surface.ROTATION_270] = mRotatedViews[Surface.ROTATION_90];

        mCurrentView = mRotatedViews[Surface.ROTATION_0];



        getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener);
@@ -589,10 +591,11 @@ public class NavigationBarView extends LinearLayout { 
    }



    public void reorient() {

        int orientation = getResources().getConfiguration().orientation;

        mRotatedViews[Configuration.ORIENTATION_PORTRAIT].setVisibility(View.GONE);

        mRotatedViews[Configuration.ORIENTATION_LANDSCAPE].setVisibility(View.GONE);

        mCurrentView = mRotatedViews[orientation];

        final int rot = mDisplay.getRotation();

        for (int i=0; i<4; i++) {

            mRotatedViews[i].setVisibility(View.GONE);

        }

        mCurrentView = mRotatedViews[rot];

        mCurrentView.setVisibility(View.VISIBLE);



        updateLayoutTransitionsEnabled();