diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-01 13:33:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-01 13:33:46 -0700 |
| commit | 63f366978e10ed243e7d63d24fddcc1b0017eb68 (patch) | |
| tree | f9626f095fdbd91d3c4cd15c0b4266bf179fcc70 /core | |
| parent | 4f405ecee998e704023fcd6b1f67aae4f0b5979c (diff) | |
| parent | 41c738849c1fdf29357048ec9f5e48143dbb026a (diff) | |
| download | frameworks_base-63f366978e10ed243e7d63d24fddcc1b0017eb68.zip frameworks_base-63f366978e10ed243e7d63d24fddcc1b0017eb68.tar.gz frameworks_base-63f366978e10ed243e7d63d24fddcc1b0017eb68.tar.bz2 | |
am 41c73884: am 5b4d0e84: Merge "TabWidget orientation"
* commit '41c738849c1fdf29357048ec9f5e48143dbb026a':
TabWidget orientation
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/TabWidget.java | 1 | ||||
| -rw-r--r-- | core/res/res/layout/tab_content.xml | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 36adacd..ce4e8e5 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -115,7 +115,6 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { } private void initTabWidget() { - setOrientation(LinearLayout.HORIZONTAL); mGroupFlags |= FLAG_USE_CHILD_DRAWING_ORDER; final Context context = mContext; diff --git a/core/res/res/layout/tab_content.xml b/core/res/res/layout/tab_content.xml index 0ee87ce..79147fb 100644 --- a/core/res/res/layout/tab_content.xml +++ b/core/res/res/layout/tab_content.xml @@ -22,8 +22,9 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <TabWidget android:id="@android:id/tabs" android:layout_width="match_parent" - android:layout_height="wrap_content" android:layout_weight="0" /> + <TabWidget android:id="@android:id/tabs" + android:orientation="horizontal" android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_weight="0" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"/> |