Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2

Browse Source
This commit is contained in:
Adam Powell
2011-05-19 15:48:38 -07:00
committed by Android (Google) Code Review
parent 9c9088a54f dacbb746c9
commit b9537db8d9
5 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -28,6 +28,8 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
@@ -979,6 +981,21 @@ public class ActionBarView extends ViewGroup {
mIconView = (ImageView) findViewById(com.android.internal.R.id.home);
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
// Make sure we reload positioning elements that may change with configuration.
Resources res = getContext().getResources();
final int imagePadding = res.getDimensionPixelSize(
com.android.internal.R.dimen.action_bar_home_image_padding);
final int upMargin = res.getDimensionPixelSize(
com.android.internal.R.dimen.action_bar_home_up_margin);
mIconView.setPadding(imagePadding, getPaddingTop(), imagePadding, getPaddingBottom());
((LayoutParams) mUpView.getLayoutParams()).rightMargin = upMargin;
mUpView.requestLayout();
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
measureChildWithMargins(mUpView, widthMeasureSpec, 0, heightMeasureSpec, 0);

36
core/res/res/layout-w720dp/action_bar_home.xml
View File

@@ -1,36 +0,0 @@
<?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>

6
core/res/res/layout/action_bar_home.xml
View File

@@ -25,12 +25,12 @@
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="-4dip" />
android:layout_marginRight="@dimen/action_bar_home_up_margin" />
<ImageView android:id="@android:id/home"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="8dip"
android:paddingRight="8dip"
android:paddingLeft="@dimen/action_bar_home_image_padding"
android:paddingRight="@dimen/action_bar_home_image_padding"
android:layout_gravity="center"
android:scaleType="center" />
</view>

24
core/res/res/values-w720dp/dimens.xml Normal file
View File

@@ -0,0 +1,24 @@
<?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.
-->
<resources>
<!-- Size of the margin between the 'up' visual and the image in
the action bar home section. -->
<dimen name="action_bar_home_up_margin">-12dip</dimen>
<!-- Size of the padding on either side of the app-supplied image
in the action bar home section. -->
<dimen name="action_bar_home_image_padding">16dip</dimen>
</resources>

8
core/res/res/values/dimens.xml
View File

@@ -81,4 +81,12 @@
<dimen name="alert_dialog_title_height">48dip</dimen>
<!-- Dialog button bar height -->
<dimen name="alert_dialog_button_bar_height">48dip</dimen>
<!-- Size of the margin between the 'up' visual and the image in
the action bar home section. -->
<dimen name="action_bar_home_up_margin">-4dip</dimen>
<!-- Size of the padding on either side of the app-supplied image
in the action bar home section. -->
<dimen name="action_bar_home_image_padding">8dip</dimen>
</resources>