diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-01 13:30:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-01 13:30:49 -0700 |
| commit | 41c738849c1fdf29357048ec9f5e48143dbb026a (patch) | |
| tree | 3a7e45342287dd1a95d1b9c297d3b2c6e22b4fde /core | |
| parent | ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba (diff) | |
| parent | 5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630 (diff) | |
| download | frameworks_base-41c738849c1fdf29357048ec9f5e48143dbb026a.zip frameworks_base-41c738849c1fdf29357048ec9f5e48143dbb026a.tar.gz frameworks_base-41c738849c1fdf29357048ec9f5e48143dbb026a.tar.bz2 | |
am 5b4d0e84: Merge "TabWidget orientation"
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
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 afae7ef..b4b355a 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -109,7 +109,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"/> |