Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd11e2b7cdd283ebfd2c41e7616a54bcc084d0a30':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
This commit is contained in:
Yigit Boyar
2014-12-02 02:19:22 +00:00
committed by Android Git Automerger
parent 6591b0259c d11e2b7cdd
commit f4835bd7b1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/widget/ToolbarWidgetWrapper.java
View File

@@ -97,6 +97,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
mTitle = toolbar.getTitle(); mTitle = toolbar.getTitle();
mSubtitle = toolbar.getSubtitle(); mSubtitle = toolbar.getSubtitle();
mTitleSet = mTitle != null; mTitleSet = mTitle != null;
mNavIcon = mToolbar.getNavigationIcon();
final TypedArray a = toolbar.getContext().obtainStyledAttributes(null, final TypedArray a = toolbar.getContext().obtainStyledAttributes(null,
R.styleable.ActionBar, R.attr.actionBarStyle, 0); R.styleable.ActionBar, R.attr.actionBarStyle, 0);
mDefaultNavigationIcon = a.getDrawable(R.styleable.ActionBar_homeAsUpIndicator); mDefaultNavigationIcon = a.getDrawable(R.styleable.ActionBar_homeAsUpIndicator);
@@ -120,7 +121,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar {
if (icon != null) { if (icon != null) {
setIcon(icon); setIcon(icon);
} }
if (mDefaultNavigationIcon != null) { if (mNavIcon == null && mDefaultNavigationIcon != null) {
setNavigationIcon(mDefaultNavigationIcon); setNavigationIcon(mDefaultNavigationIcon);
} }
setDisplayOptions(a.getInt(R.styleable.ActionBar_displayOptions, 0)); setDisplayOptions(a.getInt(R.styleable.ActionBar_displayOptions, 0));