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

Commit 24c2c853 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Tell NavigationBarView when mode changes. 

We were telling the NavigationBarView what mode it was in when it
first connected to the OverviewProxyService, but not alerting it to
any updates to the mode thereafter.

Fixes: 229413744
Test: manual
Change-Id: Iddced03b38032a27790bcf3bbfb710813d6ef139
parent 9da14f77

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+3 −1
Original line number Diff line number Diff line
@@ -330,7 +330,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        @Override

        public void onConnectionChanged(boolean isConnected) {

            mView.onOverviewProxyConnectionChange(

                    mOverviewProxyService.isEnabled(), mOverviewProxyService.shouldShowSwipeUpUI());

                    mOverviewProxyService.isEnabled());

            mView.setShouldShowSwipeUpUi(mOverviewProxyService.shouldShowSwipeUpUI());

            updateScreenPinningGestures();

        }
@@ -1657,6 +1658,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
            }

            if (mView != null) {

                mView.setNavBarMode(mode);

                mView.setShouldShowSwipeUpUi(mOverviewProxyService.shouldShowSwipeUpUI());

            }

        }

    };

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+4 −1
Original line number Diff line number Diff line
@@ -886,8 +886,11 @@ public class NavigationBarView extends FrameLayout { 
        }

    }



    void onOverviewProxyConnectionChange(boolean enabled, boolean showSwipeUpUi) {

    void onOverviewProxyConnectionChange(boolean enabled) {

        mOverviewProxyEnabled = enabled;

    }



    void setShouldShowSwipeUpUi(boolean showSwipeUpUi) {

        mShowSwipeUpUi = showSwipeUpUi;

        updateStates();

    }