Michael Kolb | a2b2ba8 | 2010-08-04 17:54:03 -0700 | [diff] [blame] | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- |
| 3 | Copyright 2010, The Android Open Source Project Licensed under the |
| 4 | Apache License, Version 2.0 (the "License"); you may not use this file |
| 5 | except in compliance with the License. You may obtain a copy of the |
| 6 | License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by |
| 7 | applicable law or agreed to in writing, software distributed under the |
| 8 | License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR |
| 9 | CONDITIONS OF ANY KIND, either express or implied. See the License for |
| 10 | the specific language governing permissions and limitations under the |
| 11 | License. |
| 12 | --> |
Michael Kolb | ebba8b4 | 2010-09-30 12:57:59 -0700 | [diff] [blame] | 13 | <merge |
Michael Kolb | a2b2ba8 | 2010-08-04 17:54:03 -0700 | [diff] [blame] | 14 | xmlns:android="http://schemas.android.com/apk/res/android" |
| 15 | android:id="@+id/tabbarcontent" |
| 16 | android:layout_width="match_parent" |
Michael Kolb | 2b5a13a | 2010-12-09 14:13:42 -0800 | [diff] [blame^] | 17 | android:layout_height="56dip" |
Michael Kolb | ebba8b4 | 2010-09-30 12:57:59 -0700 | [diff] [blame] | 18 | android:orientation="horizontal" |
Michael Kolb | 2b5a13a | 2010-12-09 14:13:42 -0800 | [diff] [blame^] | 19 | android:paddingLeft="12dip" |
| 20 | android:paddingTop="12dip" |
| 21 | android:paddingRight="0dip" |
| 22 | android:paddingBottom="0dip" |
Michael Kolb | ed21774 | 2010-08-10 17:52:34 -0700 | [diff] [blame] | 23 | style="@style/ActionBarStyle" |
Michael Kolb | ebba8b4 | 2010-09-30 12:57:59 -0700 | [diff] [blame] | 24 | > |
Michael Kolb | ed21774 | 2010-08-10 17:52:34 -0700 | [diff] [blame] | 25 | <com.android.browser.TabScrollView |
| 26 | android:id="@+id/tabs" |
Michael Kolb | ebba8b4 | 2010-09-30 12:57:59 -0700 | [diff] [blame] | 27 | android:layout_width="wrap_content" |
Michael Kolb | 2b5a13a | 2010-12-09 14:13:42 -0800 | [diff] [blame^] | 28 | android:layout_height="44dip" |
Michael Kolb | ed21774 | 2010-08-10 17:52:34 -0700 | [diff] [blame] | 29 | android:orientation="horizontal" /> |
Michael Kolb | ebba8b4 | 2010-09-30 12:57:59 -0700 | [diff] [blame] | 30 | <ImageButton |
| 31 | android:id="@+id/newtab" |
| 32 | android:src="@drawable/ic_menu_new_window" |
| 33 | android:layout_width="wrap_content" |
Michael Kolb | 2b5a13a | 2010-12-09 14:13:42 -0800 | [diff] [blame^] | 34 | android:layout_height="44dip" |
Michael Kolb | ebba8b4 | 2010-09-30 12:57:59 -0700 | [diff] [blame] | 35 | style="@style/HoloButton" |
Michael Kolb | 2b5a13a | 2010-12-09 14:13:42 -0800 | [diff] [blame^] | 36 | android:background="@drawable/browsertab_add" /> |
Michael Kolb | ebba8b4 | 2010-09-30 12:57:59 -0700 | [diff] [blame] | 37 | </merge> |