Merge "Fix bug 5296851 - Silly monkeys."

adamp · Android (Google) Code Review · commit 66d46f1db8d3 · 2011-09-12T19:19:33.000-07:00
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
@@ -268,8 +268,10 @@ protected void onConfigurationChanged(Configuration newConfig) {
 
         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);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,10 @@ protected void onConfigurationChanged(Configuration newConfig) {`
`268`	`268`
`269`	`269`	`if (mTabScrollView != null && mIncludeTabs) {`
`270`	`270`	`ViewGroup.LayoutParams lp = mTabScrollView.getLayoutParams();`
`271`		`- lp.width = LayoutParams.WRAP_CONTENT;`
`272`		`- lp.height = LayoutParams.MATCH_PARENT;`
	`271`	`+ if (lp != null) {`
	`272`	`+ lp.width = LayoutParams.WRAP_CONTENT;`
	`273`	`+ lp.height = LayoutParams.MATCH_PARENT;`
	`274`	`+ }`
`273`	`275`	`mTabScrollView.setAllowCollapse(true);`
`274`	`276`	`}`
`275`	`277`	`}`