diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-18 15:24:47 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-18 15:24:47 -0400 |
| commit | d5921f69a662fe3df1087a8042e3b7a1bf6fc62d (patch) | |
| tree | a650b7b6847d776f68db984bfcb6d5d953672b7c /res | |
| parent | 540035dfd1347c78eeec10ec0847e18fcc50ef36 (diff) | |
| parent | a3315564bdf76716f3a21d0f289e9d4e058d5290 (diff) | |
| download | packages_apps_Browser-d5921f69a662fe3df1087a8042e3b7a1bf6fc62d.zip packages_apps_Browser-d5921f69a662fe3df1087a8042e3b7a1bf6fc62d.tar.gz packages_apps_Browser-d5921f69a662fe3df1087a8042e3b7a1bf6fc62d.tar.bz2 | |
Merge change 25777 into eclair
* changes:
Give more space to the close button, and highlight separately from tab.
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/close_background.xml | 25 | ||||
| -rw-r--r-- | res/layout/tab_view.xml | 12 |
2 files changed, 32 insertions, 5 deletions
diff --git a/res/drawable/close_background.xml b/res/drawable/close_background.xml new file mode 100644 index 0000000..627712f --- /dev/null +++ b/res/drawable/close_background.xml @@ -0,0 +1,25 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_window_focused="false" + android:drawable="@android:color/transparent" /> + <item android:state_focused="false" android:state_pressed="true" + android:drawable="@*android:drawable/list_selector_background_transition" /> + <item android:state_focused="false" android:state_pressed="false" + android:drawable="@color/black"/> +</selector> diff --git a/res/layout/tab_view.xml b/res/layout/tab_view.xml index 167621e..1f01d79 100644 --- a/res/layout/tab_view.xml +++ b/res/layout/tab_view.xml @@ -58,11 +58,13 @@ android:layout_marginTop="5dip" android:layout_marginBottom="5dip" /> - <ImageView android:id="@+id/close" - android:src="@drawable/ic_btn_close_panel" + <view class="com.android.browser.ActiveTabsPage$CloseHolder" android:id="@+id/close" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dip" - android:layout_marginRight="8dip" + android:layout_height="fill_parent" + android:paddingLeft="18dip" + android:paddingRight="18dip" + android:background="@drawable/close_background" + android:src="@drawable/ic_btn_close_panel" + android:scaleType="center" /> </LinearLayout> |