diff options
| author | Michael Kolb <kolby@google.com> | 2011-07-12 15:33:08 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2011-07-12 16:32:04 -0700 |
| commit | 9ef259af433edc5aeb11b5d5d94dc9acc697c61e (patch) | |
| tree | 132cb497cbdac4c0f5d90e3d3c3ce09756392e76 /res/layout | |
| parent | 9cfe5244059ec719973fc465b5d2f536ea597bdf (diff) | |
| download | packages_apps_Browser-9ef259af433edc5aeb11b5d5d94dc9acc697c61e.zip packages_apps_Browser-9ef259af433edc5aeb11b5d5d94dc9acc697c61e.tar.gz packages_apps_Browser-9ef259af433edc5aeb11b5d5d94dc9acc697c61e.tar.bz2 | |
use screenshots for tab switcher
also removed the old tab switcher code
Change-Id: Id84ff64e42e5e1f70f55e136efdf84270c1a4b7b
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/active_tabs.xml | 54 | ||||
| -rw-r--r-- | res/layout/nav_tab_view.xml | 5 |
2 files changed, 2 insertions, 57 deletions
diff --git a/res/layout/active_tabs.xml b/res/layout/active_tabs.xml deleted file mode 100644 index f9bd6b0..0000000 --- a/res/layout/active_tabs.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <Button - android:id="@+id/new_tab" - android:text="@string/new_tab" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <Button - android:id="@+id/new_incognito_tab" - android:text="@string/new_incognito_tab" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:paddingLeft="0dip" - android:paddingRight="0dip" /> - - </LinearLayout> - - <ListView - android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:listSelector="@drawable/bookmark_thumb_selector" - android:drawSelectorOnTop="true" - android:focusable="true" - android:focusableInTouchMode="true" /> - -</merge> diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml index 543c26e..05c91a0 100644 --- a/res/layout/nav_tab_view.xml +++ b/res/layout/nav_tab_view.xml @@ -48,11 +48,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> </LinearLayout> - <FrameLayout + <ImageView android:id="@+id/tab_view" android:layout_width="@dimen/nav_tab_width" android:layout_height="@dimen/nav_tab_height" android:layout_gravity="center_horizontal" - android:focusable="false"> - </FrameLayout> + android:focusable="false" /> </LinearLayout> |