Merge "New Holo style for Tabs." (5b78d8a8) · Commits · e / os / android_frameworks_base

core/java/android/widget/TabHost.java

+24 −5

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import com.android.internal.R;
		import android.app.LocalActivityManager;
		import android.content.Context;
		import android.content.Intent;
		import android.content.res.TypedArray;
		import android.graphics.drawable.Drawable;
		import android.os.Build;
		import android.util.AttributeSet;
		@@ -63,6 +64,8 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode
		private OnTabChangeListener mOnTabChangeListener;
		private OnKeyListener mTabKeyListener;

		private int mTabLayoutId;

		public TabHost(Context context) {
		super(context);
		initTabHost();
		@@ -70,6 +73,18 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode

		public TabHost(Context context, AttributeSet attrs) {
		super(context, attrs);

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

		mTabLayoutId = a.getResourceId(R.styleable.TabWidget_tabLayout, 0);
		if (mTabLayoutId == 0) {
		throw new IllegalArgumentException("Invalid TabWidget tabLayout id");
		}

		a.recycle();

		initTabHost();
		}

		@@ -214,6 +229,7 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		if (tabSpec.mIndicatorStrategy instanceof ViewIndicatorStrategy) {
		mTabWidget.setStripEnabled(false);
		}

		mTabWidget.addView(tabIndicator);
		mTabSpecs.add(tabSpec);

		@@ -513,7 +529,7 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		final Context context = getContext();
		LayoutInflater inflater =
		(LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
		View tabIndicator = inflater.inflate(R.layout.tab_indicator,
		View tabIndicator = inflater.inflate(mTabLayoutId,
		mTabWidget, // tab widget is the parent
		false); // no inflate params

		@@ -547,7 +563,7 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		final Context context = getContext();
		LayoutInflater inflater =
		(LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
		View tabIndicator = inflater.inflate(R.layout.tab_indicator,
		View tabIndicator = inflater.inflate(mTabLayoutId,
		mTabWidget, // tab widget is the parent
		false); // no inflate params

		@@ -555,7 +571,10 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		tv.setText(mLabel);

		final ImageView iconView = (ImageView) tabIndicator.findViewById(R.id.icon);
		if (mIcon != null) {
		iconView.setImageDrawable(mIcon);
		iconView.setVisibility(VISIBLE);
		}

		if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.DONUT) {
		// Donut apps get old color scheme

core/java/android/widget/TabWidget.java

+3 −11

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
		final Context context = mContext;
		final Resources resources = context.getResources();

		// Tests the target Sdk version, as set in the Manifest. Could not be set using styles.xml
		// in a values-v? directory which targets the current platform Sdk version instead.
		if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.DONUT) {
		// Donut apps get old color scheme
		if (mLeftStrip == null) {
		@@ -131,16 +133,6 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
		mRightStrip = resources.getDrawable(
		com.android.internal.R.drawable.tab_bottom_right_v4);
		}
		} else {
		// Use modern color scheme for Eclair and beyond
		if (mLeftStrip == null) {
		mLeftStrip = resources.getDrawable(
		com.android.internal.R.drawable.tab_bottom_left);
		}
		if (mRightStrip == null) {
		mRightStrip = resources.getDrawable(
		com.android.internal.R.drawable.tab_bottom_right);
		}
		}

		// Deal with focus, as we don't want the focus to go by default

core/java/android/widget/TextView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -7142,6 +7142,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		case Gravity.RIGHT:
		return 0.0f;
		case Gravity.CENTER_HORIZONTAL:
		case Gravity.FILL_HORIZONTAL:
		return (mLayout.getLineWidth(0) - ((mRight - mLeft) -
		getCompoundPaddingLeft() - getCompoundPaddingRight())) /
		getHorizontalFadingEdgeLength();

core/res/res/drawable-hdpi/tab_arrow_left_holo_dark.png

deleted100644 → 0

−597 B

Loading image diff...

core/res/res/drawable-hdpi/tab_arrow_left_holo_light.png

deleted100644 → 0

−728 B

Loading image diff...