diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-01 13:19:02 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-01 13:19:02 -0700 |
| commit | 5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630 (patch) | |
| tree | 1f3ef20269ea53e71be5d9e9d0072cbaa08c5a44 /core | |
| parent | b6db2d5125511284ee0962dd85d9be0099e51b22 (diff) | |
| parent | a7e77546ca9e408373b7718aaf807bbbb5097cbe (diff) | |
| download | frameworks_base-5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630.zip frameworks_base-5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630.tar.gz frameworks_base-5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630.tar.bz2 | |
Merge "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 4e1b585..830fcd1 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -106,7 +106,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"/> |