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

Commit 3512953d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev

parents c611e97f 98cdafb1

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/phone/NavBarButtonProvider.java

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ public interface NavBarButtonProvider extends Plugin { 


    public static final String ACTION = "com.android.systemui.action.PLUGIN_NAV_BUTTON";



    public static final int VERSION = 2;

    public static final int VERSION = 3;



    /**

     * Returns a view in the nav bar.  If the id is set "back", "home", "recent_apps", "menu",
@@ -46,8 +46,6 @@ public interface NavBarButtonProvider extends Plugin { 


        void setVertical(boolean vertical);



        void setCarMode(boolean carMode);



        void setDarkIntensity(float intensity);

    }

}

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

+0 −10
Original line number Diff line number Diff line
@@ -174,16 +174,6 @@ public class ButtonDispatcher { 
        mCurrentView = currentView.findViewById(mId);

    }



    public void setCarMode(boolean carMode) {

        final int N = mViews.size();

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

            final View view = mViews.get(i);

            if (view instanceof ButtonInterface) {

                ((ButtonInterface) view).setCarMode(carMode);

            }

        }

    }



    public void setVertical(boolean vertical) {

        mVertical = vertical;

        final int N = mViews.size();

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

+0 −2
Original line number Diff line number Diff line
@@ -683,8 +683,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 


            if (isCarMode != mInCarMode) {

                mInCarMode = isCarMode;

                getHomeButton().setCarMode(isCarMode);



                if (ALTERNATE_CAR_MODE_UI) {

                    mUseCarModeUi = isCarMode;

                    uiCarModeChanged = true;

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+0 −5
Original line number Diff line number Diff line
@@ -304,11 +304,6 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
    public void setVertical(boolean vertical) {

        //no op

    }



    @Override

    public void setCarMode(boolean carMode) {

        // no op

    }

}