diff options
44 files changed, 127 insertions, 21 deletions
diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java index ff31dec2ff0c..2949208b3ef1 100644 --- a/core/java/android/widget/TabHost.java +++ b/core/java/android/widget/TabHost.java @@ -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 @@ -525,7 +541,7 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); tabIndicator.setBackgroundResource(R.drawable.tab_indicator_v4); tv.setTextColor(context.getResources().getColorStateList(R.color.tab_indicator_text_v4)); } - + return tabIndicator; } } @@ -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,14 +571,17 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); tv.setText(mLabel); final ImageView iconView = (ImageView) tabIndicator.findViewById(R.id.icon); - iconView.setImageDrawable(mIcon); + if (mIcon != null) { + iconView.setImageDrawable(mIcon); + iconView.setVisibility(VISIBLE); + } if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.DONUT) { // Donut apps get old color scheme tabIndicator.setBackgroundResource(R.drawable.tab_indicator_v4); tv.setTextColor(context.getResources().getColorStateList(R.color.tab_indicator_text_v4)); } - + return tabIndicator; } } diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 0469e7bf7227..36adacdf2620 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -120,7 +120,9 @@ 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 diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 09563fc564fe..6897537a5a6d 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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(); diff --git a/core/res/res/drawable-hdpi/tab_arrow_left_holo_dark.png b/core/res/res/drawable-hdpi/tab_arrow_left_holo_dark.png Binary files differdeleted file mode 100644 index cfd6f785c880..000000000000 --- a/core/res/res/drawable-hdpi/tab_arrow_left_holo_dark.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_arrow_left_holo_light.png b/core/res/res/drawable-hdpi/tab_arrow_left_holo_light.png Binary files differdeleted file mode 100644 index 036aa8c0b6ad..000000000000 --- a/core/res/res/drawable-hdpi/tab_arrow_left_holo_light.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_arrow_right_holo_dark.png b/core/res/res/drawable-hdpi/tab_arrow_right_holo_dark.png Binary files differdeleted file mode 100644 index b22603879561..000000000000 --- a/core/res/res/drawable-hdpi/tab_arrow_right_holo_dark.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_arrow_right_holo_light.png b/core/res/res/drawable-hdpi/tab_arrow_right_holo_light.png Binary files differdeleted file mode 100644 index 0e5fbe671c01..000000000000 --- a/core/res/res/drawable-hdpi/tab_arrow_right_holo_light.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_bottom_holo.9.png b/core/res/res/drawable-hdpi/tab_bottom_holo.9.png Binary files differnew file mode 100644 index 000000000000..ec9fa8d8054e --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_bottom_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_divider_holo_dark.png b/core/res/res/drawable-hdpi/tab_divider_holo_dark.png Binary files differdeleted file mode 100644 index 112cb04b829e..000000000000 --- a/core/res/res/drawable-hdpi/tab_divider_holo_dark.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_divider_holo_light.png b/core/res/res/drawable-hdpi/tab_divider_holo_light.png Binary files differdeleted file mode 100644 index 1bf4d386881a..000000000000 --- a/core/res/res/drawable-hdpi/tab_divider_holo_light.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_selected_focused_holo.9.png b/core/res/res/drawable-hdpi/tab_selected_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..1ba35d554811 --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_selected_focused_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_selected_holo.9.png b/core/res/res/drawable-hdpi/tab_selected_holo.9.png Binary files differnew file mode 100644 index 000000000000..ef913cc8e593 --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_selected_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png b/core/res/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..d7e968806aed --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_selected_pressed_holo.9.png b/core/res/res/drawable-hdpi/tab_selected_pressed_holo.9.png Binary files differnew file mode 100644 index 000000000000..b8b1fcfe2655 --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_selected_pressed_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_selector_holo_dark.9.png b/core/res/res/drawable-hdpi/tab_selector_holo_dark.9.png Binary files differdeleted file mode 100644 index f01b9bc3f92e..000000000000 --- a/core/res/res/drawable-hdpi/tab_selector_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_strip_holo.9.png b/core/res/res/drawable-hdpi/tab_strip_holo.9.png Binary files differdeleted file mode 100644 index d937f6b9e2a3..000000000000 --- a/core/res/res/drawable-hdpi/tab_strip_holo.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/tab_unselected_focused_holo.9.png b/core/res/res/drawable-hdpi/tab_unselected_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..256e8e7302e4 --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_unselected_focused_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_unselected_holo.9.png b/core/res/res/drawable-hdpi/tab_unselected_holo.9.png Binary files differnew file mode 100644 index 000000000000..eaa306aee14b --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_unselected_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png b/core/res/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..d17b82026b64 --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png diff --git a/core/res/res/drawable-hdpi/tab_unselected_pressed_holo.9.png b/core/res/res/drawable-hdpi/tab_unselected_pressed_holo.9.png Binary files differnew file mode 100644 index 000000000000..a344994fb5c9 --- /dev/null +++ b/core/res/res/drawable-hdpi/tab_unselected_pressed_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_arrow_left_holo_dark.png b/core/res/res/drawable-mdpi/tab_arrow_left_holo_dark.png Binary files differdeleted file mode 100644 index 4f8bafe08ce0..000000000000 --- a/core/res/res/drawable-mdpi/tab_arrow_left_holo_dark.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/tab_arrow_left_holo_light.png b/core/res/res/drawable-mdpi/tab_arrow_left_holo_light.png Binary files differdeleted file mode 100644 index 8e225fce686e..000000000000 --- a/core/res/res/drawable-mdpi/tab_arrow_left_holo_light.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/tab_arrow_right_holo_dark.png b/core/res/res/drawable-mdpi/tab_arrow_right_holo_dark.png Binary files differdeleted file mode 100644 index 0a8006de9829..000000000000 --- a/core/res/res/drawable-mdpi/tab_arrow_right_holo_dark.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/tab_arrow_right_holo_light.png b/core/res/res/drawable-mdpi/tab_arrow_right_holo_light.png Binary files differdeleted file mode 100644 index 85aae47d55f2..000000000000 --- a/core/res/res/drawable-mdpi/tab_arrow_right_holo_light.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/tab_bottom_holo.9.png b/core/res/res/drawable-mdpi/tab_bottom_holo.9.png Binary files differnew file mode 100644 index 000000000000..1e40b9c553ad --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_bottom_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_divider_holo_dark.png b/core/res/res/drawable-mdpi/tab_divider_holo_dark.png Binary files differdeleted file mode 100644 index 89d7b8bec2e3..000000000000 --- a/core/res/res/drawable-mdpi/tab_divider_holo_dark.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/tab_divider_holo_light.png b/core/res/res/drawable-mdpi/tab_divider_holo_light.png Binary files differdeleted file mode 100644 index 878b2b42aa83..000000000000 --- a/core/res/res/drawable-mdpi/tab_divider_holo_light.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/tab_focused_holo.9.png b/core/res/res/drawable-mdpi/tab_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..187d8c56e11e --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_focused_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_pressed_holo.9.png b/core/res/res/drawable-mdpi/tab_pressed_holo.9.png Binary files differnew file mode 100644 index 000000000000..a76fbae5be06 --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_pressed_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_selected_focused_holo.9.png b/core/res/res/drawable-mdpi/tab_selected_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..9a33cd2d9287 --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_selected_focused_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_selected_holo.9.png b/core/res/res/drawable-mdpi/tab_selected_holo.9.png Binary files differnew file mode 100644 index 000000000000..e029e577a711 --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_selected_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png b/core/res/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..285116e31e1c --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_selected_pressed_holo.9.png b/core/res/res/drawable-mdpi/tab_selected_pressed_holo.9.png Binary files differnew file mode 100644 index 000000000000..dadefa758af5 --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_selected_pressed_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_selector_holo_dark.9.png b/core/res/res/drawable-mdpi/tab_selector_holo_dark.9.png Binary files differdeleted file mode 100644 index 30d30df42b1d..000000000000 --- a/core/res/res/drawable-mdpi/tab_selector_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/tab_unselected_focused_holo.9.png b/core/res/res/drawable-mdpi/tab_unselected_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..032a9921c54e --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_unselected_focused_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_unselected_holo.9.png b/core/res/res/drawable-mdpi/tab_unselected_holo.9.png Binary files differnew file mode 100644 index 000000000000..848f3f13363c --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_unselected_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png b/core/res/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png Binary files differnew file mode 100644 index 000000000000..384513584731 --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png diff --git a/core/res/res/drawable-mdpi/tab_unselected_pressed_holo.9.png b/core/res/res/drawable-mdpi/tab_unselected_pressed_holo.9.png Binary files differnew file mode 100644 index 000000000000..23fd8c9b351c --- /dev/null +++ b/core/res/res/drawable-mdpi/tab_unselected_pressed_holo.9.png diff --git a/core/res/res/drawable/tab_bottom_right.xml b/core/res/res/drawable/tab_bottom_right.xml index f7f5c2f5a07c..450c461e983b 100644 --- a/core/res/res/drawable/tab_bottom_right.xml +++ b/core/res/res/drawable/tab_bottom_right.xml @@ -16,6 +16,6 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" android:drawable="@drawable/tab_press_bar_right"/> - <item android:state_focused="false" android:state_pressed="false" android:drawable="@drawable/tab_selected_bar_right"/> - <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/tab_focus_bar_right"/> + <item android:state_focused="false" android:drawable="@drawable/tab_selected_bar_right"/> + <item android:state_focused="true" android:drawable="@drawable/tab_focus_bar_right"/> </selector> diff --git a/core/res/res/drawable/tab_indicator_holo.xml b/core/res/res/drawable/tab_indicator_holo.xml new file mode 100644 index 000000000000..0d46e0c471fd --- /dev/null +++ b/core/res/res/drawable/tab_indicator_holo.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Non focused states --> + <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/tab_unselected_holo" /> + <item android:state_focused="false" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_holo" /> + + <!-- Focused states --> + <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/tab_unselected_focused_holo" /> + <item android:state_focused="true" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_focused_holo" /> + + <!-- Pressed --> + <!-- Non focused states --> + <item android:state_focused="false" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_holo" /> + <item android:state_focused="false" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_holo" /> + + <!-- Focused states --> + <item android:state_focused="true" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_focused_holo" /> + <item android:state_focused="true" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_focused_holo" /> +</selector> diff --git a/core/res/res/layout/tab_indicator.xml b/core/res/res/layout/tab_indicator.xml index 71e400180898..bc657c399c26 100644 --- a/core/res/res/layout/tab_indicator.xml +++ b/core/res/res/layout/tab_indicator.xml @@ -20,7 +20,6 @@ android:layout_weight="1" android:layout_marginLeft="-3dip" android:layout_marginRight="-3dip" - android:orientation="vertical" android:background="@android:drawable/tab_indicator"> <ImageView android:id="@+id/icon" diff --git a/core/res/res/layout/tab_indicator_holo.xml b/core/res/res/layout/tab_indicator_holo.xml new file mode 100644 index 000000000000..d37476be2336 --- /dev/null +++ b/core/res/res/layout/tab_indicator_holo.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="56dip" + android:layout_weight="0" + android:layout_marginLeft="0dip" + android:layout_marginRight="0dip" + android:background="@android:drawable/tab_indicator_holo"> + + <View android:id="@+id/tab_indicator_left_spacer" + android:layout_width="16dip" + android:layout_height="0dip" /> + + <ImageView android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:visibility="gone" + android:layout_toRightOf="@id/tab_indicator_left_spacer" + android:paddingRight="8dip" /> + + <TextView android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@id/icon" + android:paddingLeft="0dip" + android:paddingRight="16dip" + style="?android:attr/tabWidgetStyle" /> + +</RelativeLayout> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index d5f1610a23ac..dab627c8a39f 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2137,6 +2137,8 @@ <attr name="tabStripLeft" format="reference" /> <!-- Drawable used to draw the right part of the strip underneath the tabs. --> <attr name="tabStripRight" format="reference" /> + <!-- Layout used to organize each tab's content. --> + <attr name="tabLayout" format="reference" /> </declare-styleable> <declare-styleable name="TextAppearance"> <!-- Text color. --> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index c441f5a193af..76a3c34abb22 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -560,6 +560,12 @@ <item name="android:textAppearance">@style/TextAppearance.Widget.TabWidget</item> <item name="ellipsize">marquee</item> <item name="singleLine">true</item> + <item name="android:tabStripLeft">@android:drawable/tab_bottom_left</item> + <item name="android:tabStripRight">@android:drawable/tab_bottom_right</item> + <item name="android:tabStripEnabled">true</item> + <item name="android:divider">@null</item> + <item name="android:gravity">fill_horizontal|center_vertical</item> + <item name="android:tabLayout">@android:layout/tab_indicator</item> </style> <style name="Widget.Gallery"> @@ -1070,7 +1076,7 @@ </style> <style name="TextAppearance.Holo.Widget.TabWidget"> - <item name="android:textSize">14sp</item> + <item name="android:textSize">18sp</item> <item name="android:textStyle">normal</item> <item name="android:textColor">@android:color/tab_indicator_text</item> </style> @@ -1421,6 +1427,13 @@ </style> <style name="Widget.Holo.TabWidget" parent="Widget.TabWidget"> + <item name="android:textAppearance">@style/TextAppearance.Holo.Widget.TabWidget</item> + <item name="android:tabStripLeft">@null</item> + <item name="android:tabStripRight">@null</item> + <item name="android:tabStripEnabled">false</item> + <item name="android:divider">@null</item> + <item name="android:gravity">left|center_vertical</item> + <item name="android:tabLayout">@android:layout/tab_indicator_holo</item> </style> <style name="Widget.Holo.WebTextView" parent="Widget.WebTextView"> @@ -1693,7 +1706,7 @@ <style name="Widget.Holo.Light.CompoundButton.Star" parent="Widget.CompoundButton.Star"> </style> - <style name="Widget.Holo.Light.TabWidget" parent="Widget.TabWidget"> + <style name="Widget.Holo.Light.TabWidget" parent="Widget.Holo.TabWidget"> </style> <style name="Widget.Holo.Light.WebTextView" parent="Widget.WebTextView"> |
