Merge "Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize... (80df829e) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -1403,16 +1403,18 @@ public class Activity extends ContextThemeWrapper
		public void onConfigurationChanged(Configuration newConfig) {
		mCalled = true;

		if (mActionBar != null) {
		mActionBar.onConfigurationChanged(newConfig);
		}

		mFragments.dispatchConfigurationChanged(newConfig);

		if (mWindow != null) {
		// Pass the configuration changed event to the window
		mWindow.onConfigurationChanged(newConfig);
		}

		if (mActionBar != null) {
		// Do this last; the action bar will need to access
		// view changes from above.
		mActionBar.onConfigurationChanged(newConfig);
		}
		}

		/**

core/java/com/android/internal/app/ActionBarImpl.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -192,8 +192,7 @@ public class ActionBarImpl extends ActionBar {
		mContentHeight = mActionView.getContentHeight();

		if (mTabScrollView != null) {
		mTabScrollView.getLayoutParams().height = mContentHeight;
		mTabScrollView.requestLayout();
		mTabScrollView.setContentHeight(mContentHeight);
		}
		}

core/java/com/android/internal/widget/ActionBarContainer.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ public class ActionBarContainer extends FrameLayout {
		mTabContainer = tabView;
		if (tabView != null) {
		addView(tabView);
		tabView.getLayoutParams().width = LayoutParams.MATCH_PARENT;
		}
		}

core/java/com/android/internal/widget/ActionBarView.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.drawable.Drawable;
		@@ -172,7 +173,8 @@ public class ActionBarView extends AbsActionBarView {
		// Background is always provided by the container.
		setBackgroundResource(0);

		TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ActionBar);
		TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ActionBar,
		com.android.internal.R.attr.actionBarStyle, 0);

		ApplicationInfo appInfo = context.getApplicationInfo();
		PackageManager pm = context.getPackageManager();
		@@ -249,6 +251,18 @@ public class ActionBarView extends AbsActionBarView {
		mHomeLayout.setFocusable(true);
		}

		@Override
		protected void onConfigurationChanged(Configuration newConfig) {
		super.onConfigurationChanged(newConfig);

		// Action bar can change size on configuration changes.
		// Reread the desired height from the theme-specified style.
		TypedArray a = getContext().obtainStyledAttributes(null, R.styleable.ActionBar,
		com.android.internal.R.attr.actionBarStyle, 0);
		setContentHeight(a.getLayoutDimension(R.styleable.ActionBar_height, 0));
		a.recycle();
		}

		@Override
		public void onDetachedFromWindow() {
		super.onDetachedFromWindow();
		@@ -318,6 +332,7 @@ public class ActionBarView extends AbsActionBarView {
		mIncludeTabs = tabs != null;
		if (mIncludeTabs && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) {
		addView(mTabScrollView);
		mTabScrollView.getLayoutParams().width = LayoutParams.WRAP_CONTENT;
		}
		}

core/java/com/android/internal/widget/ScrollingTabContainerView.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,11 @@ public class ScrollingTabContainerView extends HorizontalScrollView {
		}
		}

		public void setContentHeight(int contentHeight) {
		mTabLayout.getLayoutParams().height = contentHeight;
		requestLayout();
		}

		public void animateToVisibility(int visibility) {
		if (mVisibilityAnim != null) {
		mVisibilityAnim.cancel();