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

1 files changed, 17 insertions, 0 deletions

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index cc51911..891557d 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -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;
@@ -980,6 +982,21 @@ public class ActionBarView extends ViewGroup {
         }
 
         @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);
             final LayoutParams upLp = (LayoutParams) mUpView.getLayoutParams();