diff options
| author | Adam Powell <adamp@google.com> | 2014-06-12 19:57:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 19:57:50 +0000 |
| commit | 61c585756c43462af9d1de7275eae0dac3177e3b (patch) | |
| tree | 25dd7bf6f5849ddaf47948e92fca66cc9e0bb724 /core/java/com | |
| parent | c78f2f7feae7ec4e0439759332af4f195ba87115 (diff) | |
| parent | 6bb10554ba3a0b6127402951a477412d961d1072 (diff) | |
| download | frameworks_base-61c585756c43462af9d1de7275eae0dac3177e3b.zip frameworks_base-61c585756c43462af9d1de7275eae0dac3177e3b.tar.gz frameworks_base-61c585756c43462af9d1de7275eae0dac3177e3b.tar.bz2 | |
am 13cfcacf: Allow action bar navigation icon resource id of 0
* commit '13cfcacf2a39b742ed9b0fea25924fc828e8c107':
Allow action bar navigation icon resource id of 0
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/ToolbarWidgetWrapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java index 87c57f7..bed0b88 100644 --- a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java +++ b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java @@ -569,7 +569,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar { @Override public void setNavigationIcon(int resId) { - setNavigationIcon(mToolbar.getContext().getDrawable(resId)); + setNavigationIcon(resId != 0 ? mToolbar.getContext().getDrawable(resId) : null); } @Override |