SnapdragonCamera: Fix menu is covered when count down take picture

The textview of count down title layout is unreasonable, which lead to
some view is covered by text.

Modify the layout params of textview.

CRs-Fixed: 773384

Change-Id: I4c6cd67dcc275730de1ad61396a86f3d7250b90b

4 files changed, 21 insertions, 4 deletions

diff --git a/res/layout/count_down_to_capture.xml b/res/layout/count_down_to_capture.xml
index 68276ad40..20437506d 100644
--- a/res/layout/count_down_to_capture.xml
+++ b/res/layout/count_down_to_capture.xml
@@ -25,11 +25,11 @@
         android:textColor="@android:color/white"
         android:gravity="center" />
     <TextView android:id="@+id/count_down_title"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
-        android:paddingTop="20dp"
+        android:layout_marginTop="@dimen/count_down_title_margin_top"
+        android:gravity="center_horizontal"
         android:textSize="20sp"
         android:textColor="@android:color/white"
         android:text="@string/count_down_title_text" />
-</com.android.camera.ui.CountDownView>
\ No newline at end of file
+</com.android.camera.ui.CountDownView>
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index 41eea19ed..9f768fc98 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -18,4 +18,5 @@
     <dimen name="manage_cache_bottom_height">39dp</dimen>
     <dimen name="capture_top_margin">0dip</dimen>
     <integer name="SRI_pano_layout_weight">3</integer>
+    <dimen name="count_down_title_margin_top">20dp</dimen>
 </resources>
diff --git a/res/values-port/dimensions.xml b/res/values-port/dimensions.xml
index 6f3fe7636..67e3ebc3f 100644
--- a/res/values-port/dimensions.xml
+++ b/res/values-port/dimensions.xml
@@ -15,4 +15,5 @@
 -->
 <resources>
     <integer name="SRI_pano_layout_weight">2</integer>
+    <dimen name="count_down_title_margin_top">90dp</dimen>
 </resources>
diff --git a/src/com/android/camera/ui/CountDownView.java b/src/com/android/camera/ui/CountDownView.java
index 75cdf5e8a..d479b684a 100644
--- a/src/com/android/camera/ui/CountDownView.java
+++ b/src/com/android/camera/ui/CountDownView.java
@@ -19,6 +19,7 @@ package com.android.camera.ui;
 import java.util.Locale;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.os.Handler;
@@ -38,6 +39,8 @@ public class CountDownView extends FrameLayout {
     private static final String TAG = "CAM_CountDownView";
     private static final int SET_TIMER_TEXT = 1;
     private TextView mRemainingSecondsView;
+    private TextView mCountDownTitle = null;
+    private Context mContext;
     private int mRemainingSecs = 0;
     private OnCountDownFinishedListener mListener;
     private Animation mCountDownAnim;
@@ -49,6 +52,7 @@ public class CountDownView extends FrameLayout {
 
     public CountDownView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mContext = context;
         mCountDownAnim = AnimationUtils.loadAnimation(context, R.anim.count_down_exit);
         // Load the beeps
         if (context.getResources().getBoolean(R.bool.force_count_down_sound)) {
@@ -100,8 +104,19 @@ public class CountDownView extends FrameLayout {
     protected void onFinishInflate() {
         super.onFinishInflate();
         mRemainingSecondsView = (TextView) findViewById(R.id.remaining_seconds);
+        mCountDownTitle = (TextView) findViewById(R.id.count_down_title);
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration config) {
+        if (mCountDownTitle == null) return;
+        LayoutParams lp = (LayoutParams) mCountDownTitle.getLayoutParams();
+        lp.topMargin = mContext.getResources()
+                .getDimensionPixelSize(R.dimen.count_down_title_margin_top);
+        mCountDownTitle.setLayoutParams(lp);
+    }
+
+
     public void setCountDownFinishedListener(OnCountDownFinishedListener listener) {
         mListener = listener;
     }