diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-02 19:30:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 19:30:43 +0000 |
| commit | 288d32b92b3b8bbf1f3f02781a8616618760ae66 (patch) | |
| tree | 192ce9c9fb37969752ba2c41895e58ad74741674 /core | |
| parent | e4fe85568b52b6a25b62be9b06e9d9e59425fae9 (diff) | |
| parent | 17e0eebdc6223de1f94b5ee538919adda9f58a9a (diff) | |
| download | frameworks_base-288d32b92b3b8bbf1f3f02781a8616618760ae66.zip frameworks_base-288d32b92b3b8bbf1f3f02781a8616618760ae66.tar.gz frameworks_base-288d32b92b3b8bbf1f3f02781a8616618760ae66.tar.bz2 | |
am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '17e0eebdc6223de1f94b5ee538919adda9f58a9a':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index dda1a10..b9b6ee5 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -212,7 +212,7 @@ public class ActionBarView extends AbsActionBarView { Log.e(TAG, "Activity component name not found!", e); } } - if (mIcon == null) { + if (mIcon == null && !isInEditMode()) { mIcon = appInfo.loadIcon(pm); } } |