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

Commit bc53086a authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of 6683cc6a to oc-mr1-dev 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I20bec8ef750b6ef8627d69baa60ee4e4218cc596
parents 340e7d25 6683cc6a

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

+4 −8
Original line number Diff line number Diff line
@@ -573,15 +573,16 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
                mRotatedViews[Surface.ROTATION_180] = findViewById(R.id.rot0);

        mRotatedViews[Surface.ROTATION_270] =

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



        updateCurrentView();

    }



    public boolean needsReorient(int rotation) {

        return mCurrentRotation != rotation;

    }



    private boolean updateCurrentView() {

    private void updateCurrentView() {

        final int rot = mDisplay.getRotation();

        if (rot == mCurrentRotation) return false;

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

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

        }
@@ -593,7 +594,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        }

        updateLayoutTransitionsEnabled();

        mCurrentRotation = rot;

        return true;

    }



    private void updateRecentsIcon() {
@@ -606,14 +606,11 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    }



    public void reorient() {

        if (!updateCurrentView()) {

            return;

        }

        updateCurrentView();



        mDeadZone = (DeadZone) mCurrentView.findViewById(R.id.deadzone);



        ((NavigationBarFrame) getRootView()).setDeadZone(mDeadZone);



        mDeadZone.setDisplayRotation(mCurrentRotation);



        // force the low profile & disabled states into compliance
@@ -647,7 +644,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
            mVertical = newVertical;

            //Log.v(TAG, String.format("onSizeChanged: h=%d, w=%d, vert=%s", h, w, mVertical?"y":"n"));

            reorient();

            getHomeButton().setVertical(mVertical);

            notifyVerticalChangedListener(newVertical);

        }