diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 17:42:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 17:42:03 +0000 |
| commit | ebd909cca1f69028878f15e6fb0ece6e8c8da584 (patch) | |
| tree | dde9ec590d1163b6768def5f954636834f136448 /core/java | |
| parent | b161d6ba7f85b49e4e19d69bd107d30cdd3c0bc1 (diff) | |
| parent | ae5e0c7b9f24564547d38a77641b120d6685dd5a (diff) | |
| download | frameworks_base-ebd909cca1f69028878f15e6fb0ece6e8c8da584.zip frameworks_base-ebd909cca1f69028878f15e6fb0ece6e8c8da584.tar.gz frameworks_base-ebd909cca1f69028878f15e6fb0ece6e8c8da584.tar.bz2 | |
am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit 'ae5e0c7b9f24564547d38a77641b120d6685dd5a':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Diffstat (limited to 'core/java')
| -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 0f964b9..534e034 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -207,7 +207,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); } } |