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

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

Merge "Fixed typo."

parents 97cc85fd 15f915c6

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

+14 −14
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    private boolean mInCarMode = false;

    private boolean mInCarMode = false;

    private boolean mDockedStackExists;

    private boolean mDockedStackExists;





    private final SparseArray<ButtonDispatcher> mButtonDisatchers = new SparseArray<>();

    private final SparseArray<ButtonDispatcher> mButtonDispatchers = new SparseArray<>();

    private Configuration mConfiguration;

    private Configuration mConfiguration;





    private NavigationBarInflaterView mNavigationInflaterView;

    private NavigationBarInflaterView mNavigationInflaterView;
@@ -206,11 +206,11 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 




        mBarTransitions = new NavigationBarTransitions(this);

        mBarTransitions = new NavigationBarTransitions(this);





        mButtonDisatchers.put(R.id.back, new ButtonDispatcher(R.id.back));

        mButtonDispatchers.put(R.id.back, new ButtonDispatcher(R.id.back));

        mButtonDisatchers.put(R.id.home, new ButtonDispatcher(R.id.home));

        mButtonDispatchers.put(R.id.home, new ButtonDispatcher(R.id.home));

        mButtonDisatchers.put(R.id.recent_apps, new ButtonDispatcher(R.id.recent_apps));

        mButtonDispatchers.put(R.id.recent_apps, new ButtonDispatcher(R.id.recent_apps));

        mButtonDisatchers.put(R.id.menu, new ButtonDispatcher(R.id.menu));

        mButtonDispatchers.put(R.id.menu, new ButtonDispatcher(R.id.menu));

        mButtonDisatchers.put(R.id.ime_switcher, new ButtonDispatcher(R.id.ime_switcher));

        mButtonDispatchers.put(R.id.ime_switcher, new ButtonDispatcher(R.id.ime_switcher));

    }

    }





    public BarTransitions getBarTransitions() {

    public BarTransitions getBarTransitions() {
@@ -262,23 +262,23 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    }

    }





    public ButtonDispatcher getRecentsButton() {

    public ButtonDispatcher getRecentsButton() {

        return mButtonDisatchers.get(R.id.recent_apps);

        return mButtonDispatchers.get(R.id.recent_apps);

    }

    }





    public ButtonDispatcher getMenuButton() {

    public ButtonDispatcher getMenuButton() {

        return mButtonDisatchers.get(R.id.menu);

        return mButtonDispatchers.get(R.id.menu);

    }

    }





    public ButtonDispatcher getBackButton() {

    public ButtonDispatcher getBackButton() {

        return mButtonDisatchers.get(R.id.back);

        return mButtonDispatchers.get(R.id.back);

    }

    }





    public ButtonDispatcher getHomeButton() {

    public ButtonDispatcher getHomeButton() {

        return mButtonDisatchers.get(R.id.home);

        return mButtonDispatchers.get(R.id.home);

    }

    }





    public ButtonDispatcher getImeSwitchButton() {

    public ButtonDispatcher getImeSwitchButton() {

        return mButtonDisatchers.get(R.id.ime_switcher);

        return mButtonDispatchers.get(R.id.ime_switcher);

    }

    }





    private void updateCarModeIcons(Context ctx) {

    private void updateCarModeIcons(Context ctx) {
@@ -495,7 +495,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        mNavigationInflaterView = (NavigationBarInflaterView) findViewById(

        mNavigationInflaterView = (NavigationBarInflaterView) findViewById(

                R.id.navigation_inflater);

                R.id.navigation_inflater);

        updateRotatedViews();

        updateRotatedViews();

        mNavigationInflaterView.setButtonDispatchers(mButtonDisatchers);

        mNavigationInflaterView.setButtonDispatchers(mButtonDispatchers);





        getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener);

        getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener);
@@ -556,8 +556,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        mCurrentView = mRotatedViews[rot];

        mCurrentView = mRotatedViews[rot];

        mCurrentView.setVisibility(View.VISIBLE);

        mCurrentView.setVisibility(View.VISIBLE);

        mNavigationInflaterView.setAlternativeOrder(rot == Surface.ROTATION_90);

        mNavigationInflaterView.setAlternativeOrder(rot == Surface.ROTATION_90);

        for (int i = 0; i < mButtonDisatchers.size(); i++) {

        for (int i = 0; i < mButtonDispatchers.size(); i++) {

            mButtonDisatchers.valueAt(i).setCurrentView(mCurrentView);

            mButtonDispatchers.valueAt(i).setCurrentView(mCurrentView);

        }

        }

        updateLayoutTransitionsEnabled();

        updateLayoutTransitionsEnabled();

        mCurrentRotation = rot;

        mCurrentRotation = rot;