diff options
| author | 2011-05-18 19:16:31 -0700 | |
|---|---|---|
| committer | 2011-05-18 19:16:31 -0700 | |
| commit | c8f045b8a4cc83bc40ee999cb03a446f986d445c (patch) | |
| tree | ccd80b6346aec14a0e47bcf853bf35e8dc2f1556 | |
| parent | a13462a947e634a6893119146a7271369e509586 (diff) | |
| parent | d466a4631f3e4f482dd658f42c277d6ad281a9d1 (diff) | |
am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
* commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
| -rw-r--r-- | core/res/res/layout-w720dp/action_bar_home.xml | 36 | ||||
| -rw-r--r-- | core/res/res/layout/action_bar_home.xml | 6 |
2 files changed, 39 insertions, 3 deletions
diff --git a/core/res/res/layout-w720dp/action_bar_home.xml b/core/res/res/layout-w720dp/action_bar_home.xml new file mode 100644 index 000000000000..ece1a34ab13a --- /dev/null +++ b/core/res/res/layout-w720dp/action_bar_home.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<view xmlns:android="http://schemas.android.com/apk/res/android" + class="com.android.internal.widget.ActionBarView$HomeView" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:background="?android:attr/selectableItemBackground" > + <ImageView android:id="@android:id/up" + android:src="?android:attr/homeAsUpIndicator" + android:layout_gravity="center_vertical|left" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="-12dip" /> + <ImageView android:id="@android:id/home" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="16dip" + android:paddingRight="16dip" + android:layout_gravity="center" + android:scaleType="center" /> +</view> diff --git a/core/res/res/layout/action_bar_home.xml b/core/res/res/layout/action_bar_home.xml index c82f91d7dfd8..a45432a3105f 100644 --- a/core/res/res/layout/action_bar_home.xml +++ b/core/res/res/layout/action_bar_home.xml @@ -25,12 +25,12 @@ android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="-12dip" /> + android:layout_marginRight="-4dip" /> <ImageView android:id="@android:id/home" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingLeft="16dip" - android:paddingRight="16dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" android:layout_gravity="center" android:scaleType="center" /> </view> |