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

Commit d859e708 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix SystemUI navigation bar recent icon loading in landscape mode"

parents c51d96a9 18d9824b
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ public class NavigationBarView extends LinearLayout {

    private Drawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon;
    private Drawable mRecentIcon;
    private Drawable mRecentLandIcon;

    private DelegateViewHelper mDelegateHelper;
    private DeadZone mDeadZone;
@@ -179,6 +180,7 @@ public class NavigationBarView extends LinearLayout {
        mBackAltIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime);
        mBackAltLandIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime);
        mRecentIcon = res.getDrawable(R.drawable.ic_sysbar_recent);
        mRecentLandIcon = res.getDrawable(R.drawable.ic_sysbar_recent_land);
    }

    @Override
@@ -238,7 +240,7 @@ public class NavigationBarView extends LinearLayout {
                ? (mVertical ? mBackAltLandIcon : mBackAltIcon)
                : (mVertical ? mBackLandIcon : mBackIcon));

        ((ImageView)getRecentsButton()).setImageDrawable(mRecentIcon);
        ((ImageView)getRecentsButton()).setImageDrawable(mVertical ? mRecentLandIcon : mRecentIcon);

        setDisabledFlags(mDisabledFlags, true);
    }