commit f79de8d69c2305660e287ec872fe500b34739e44
author Doris Liu <tianliu@google.com> Wed Apr 09 22:30:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 09 22:30:27 2014 +0000
tree 126d0b0ed8b539433b3d16f85f4c9e15392d12a5
parent 2d0fdb5e6582126bd554030c7432745ae589f515
parent 240b072f9a9cb2f0b4b08ca5b8a682d78c25ce9c

Merge "Fix the layout error in preview" into gb-ub-photos-denali

src/com/android/camera/ui/BottomBar.java

diff --git a/src/com/android/camera/ui/BottomBar.java b/src/com/android/camera/ui/BottomBar.java
index fd57864..9076c1a 100644
--- a/src/com/android/camera/ui/BottomBar.java
+++ b/src/com/android/camera/ui/BottomBar.java
@@ -26,6 +26,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -310,6 +311,7 @@
 
         // Calculates the width and height needed for the bar.
         int barWidth, barHeight;
+        FrameLayout.LayoutParams lp = (LayoutParams) getLayoutParams();
         if (measureWidth > measureHeight) {
             // Landscape.
             barHeight = (int) mPreviewShortEdge;
@@ -326,6 +328,8 @@
                     setOverlayBottomBar(false);
                 }
             }
+            lp.gravity = Gravity.RIGHT | Gravity.CENTER_VERTICAL;
+
         } else {
             // Portrait
             barWidth = (int) mPreviewShortEdge;
@@ -342,7 +346,9 @@
                     setOverlayBottomBar(false);
                 }
             }
+            lp.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
         }
+        setLayoutParams(lp);
 
         super.onMeasure(MeasureSpec.makeMeasureSpec(barWidth, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(barHeight, MeasureSpec.EXACTLY));

src/com/android/camera/ui/BottomBarModeOptionsWrapper.java

diff --git a/src/com/android/camera/ui/BottomBarModeOptionsWrapper.java b/src/com/android/camera/ui/BottomBarModeOptionsWrapper.java
index 4abb68c..0177c75 100644
--- a/src/com/android/camera/ui/BottomBarModeOptionsWrapper.java
+++ b/src/com/android/camera/ui/BottomBarModeOptionsWrapper.java
@@ -48,28 +48,6 @@
     }
 
     @Override
-    public void onConfigurationChanged(Configuration config) {
-        super.onConfigurationChanged(config);
-        adjustBottomBarGravity(config);
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        adjustBottomBarGravity(getResources().getConfiguration());
-    }
-
-    private void adjustBottomBarGravity(Configuration config) {
-        FrameLayout.LayoutParams lp = (LayoutParams) mBottomBar.getLayoutParams();
-        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            lp.gravity = Gravity.RIGHT | Gravity.CENTER_VERTICAL;
-        } else {
-            lp.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
-        }
-        mBottomBar.setLayoutParams(lp);
-    }
-
-    @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         final int bottomBarWidth = mBottomBar.getMeasuredWidth();
         final int bottomBarHeight = mBottomBar.getMeasuredHeight();