diff options
| author | Adam Powell <adamp@google.com> | 2011-09-12 19:14:11 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-09-12 19:14:11 -0700 |
| commit | b8440110465cf2c0071e3b838cdb02d5a21fd2a9 (patch) | |
| tree | 104d3f64b9b6f3dfa4c6d16728c122b8a0800e1a /core/java/com/android/internal/widget/ActionBarView.java | |
| parent | 413ce9ddab86d5e2f4818859e974db04335b8d26 (diff) | |
| download | frameworks_base-b8440110465cf2c0071e3b838cdb02d5a21fd2a9.zip frameworks_base-b8440110465cf2c0071e3b838cdb02d5a21fd2a9.tar.gz frameworks_base-b8440110465cf2c0071e3b838cdb02d5a21fd2a9.tar.bz2 | |
Fix bug 5296851 - Silly monkeys.
Change-Id: Idae81d426051c2e1b00a1d1b62b505effd0a2a68
Diffstat (limited to 'core/java/com/android/internal/widget/ActionBarView.java')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 7434df3..bbecb6c 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -268,8 +268,10 @@ public class ActionBarView extends AbsActionBarView { if (mTabScrollView != null && mIncludeTabs) { ViewGroup.LayoutParams lp = mTabScrollView.getLayoutParams(); - lp.width = LayoutParams.WRAP_CONTENT; - lp.height = LayoutParams.MATCH_PARENT; + if (lp != null) { + lp.width = LayoutParams.WRAP_CONTENT; + lp.height = LayoutParams.MATCH_PARENT; + } mTabScrollView.setAllowCollapse(true); } } |