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

Commit bd2ebca9 authored by Daniel Sandler's avatar Daniel Sandler Committed by The Android Automerger
Browse files

resolved simple conflict with e03bc95f

parent f12b8642

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

+11 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.view.VelocityTracker; 
import android.view.View;

import android.view.ViewGroup;

import android.view.Surface;

import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManagerImpl;

import android.widget.ImageView;
@@ -71,6 +72,8 @@ public class NavigationBarView extends LinearLayout { 
    int mDisabledFlags = 0;

    int mNavigationIconHints = 0;



    private Drawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon;



    private DelegateViewHelper mDelegateHelper;



    // workaround for LayoutTransitions leaving the nav buttons in a weird state (bug 5549288)
@@ -304,7 +307,6 @@ public class NavigationBarView extends LinearLayout { 
        }

        mCurrentView = mRotatedViews[rot];

        mCurrentView.setVisibility(View.VISIBLE);

        mVertical = (rot == Surface.ROTATION_90 || rot == Surface.ROTATION_270);



        // force the low profile & disabled states into compliance

        setLowProfile(mLowProfile, false, true /* force */);
@@ -326,6 +328,14 @@ public class NavigationBarView extends LinearLayout { 
    protected void onSizeChanged(int w, int h, int oldw, int oldh) {

        if (DEBUG) Slog.d(TAG, String.format(

                    "onSizeChanged: (%dx%d) old: (%dx%d)", w, h, oldw, oldh));



        final boolean newVertical = w > 0 && h > w;

        if (newVertical != mVertical) {

            mVertical = newVertical;

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

            reorient();

        }



        postCheckForInvalidLayout("sizeChanged");

        super.onSizeChanged(w, h, oldw, oldh);

    }