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

Commit f4835bd7 authored by Yigit Boyar's avatar Yigit Boyar Committed by Android Git Automerger
Browse files

am d11e2b7c: am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon... 

am d11e2b7c: am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev

* commit 'd11e2b7c':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
parents 6591b025 d11e2b7c

core/java/com/android/internal/widget/ToolbarWidgetWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar { 
        mTitle = toolbar.getTitle();

        mSubtitle = toolbar.getSubtitle();

        mTitleSet = mTitle != null;

        mNavIcon = mToolbar.getNavigationIcon();

        final TypedArray a = toolbar.getContext().obtainStyledAttributes(null,

                R.styleable.ActionBar, R.attr.actionBarStyle, 0);

        mDefaultNavigationIcon = a.getDrawable(R.styleable.ActionBar_homeAsUpIndicator);
@@ -120,7 +121,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar { 
            if (icon != null) {

                setIcon(icon);

            }

            if (mDefaultNavigationIcon != null) {

            if (mNavIcon == null && mDefaultNavigationIcon != null) {

                setNavigationIcon(mDefaultNavigationIcon);

            }

            setDisplayOptions(a.getInt(R.styleable.ActionBar_displayOptions, 0));