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

Commit 0cbfa21c authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix RTL for Nav icons" into oc-dr1-dev 

am: bad473d1

Change-Id: I53e7eb19311160c18ec28b43d5ba0534890bda84
parents 98ae1bdf bad473d1

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

+4 −2
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
            mDockedIcon = getDrawable(ctx,

                    R.drawable.ic_sysbar_docked, R.drawable.ic_sysbar_docked_dark);

        }

        if (oldConfig.densityDpi != newConfig.densityDpi) {

        if (oldConfig.densityDpi != newConfig.densityDpi

                || oldConfig.getLayoutDirection() != newConfig.getLayoutDirection()) {

            mBackIcon = getDrawable(ctx, R.drawable.ic_sysbar_back, R.drawable.ic_sysbar_back_dark);

            mBackLandIcon = mBackIcon;

            mBackAltIcon = getDrawable(ctx,
@@ -672,7 +673,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        updateTaskSwitchHelper();

        updateIcons(getContext(), mConfiguration, newConfig);

        updateRecentsIcon();

        if (uiCarModeChanged || mConfiguration.densityDpi != newConfig.densityDpi) {

        if (uiCarModeChanged || mConfiguration.densityDpi != newConfig.densityDpi

                || mConfiguration.getLayoutDirection() != newConfig.getLayoutDirection()) {

            // If car mode or density changes, we need to reset the icons.

            setNavigationIconHints(mNavigationIconHints, true);

        }