diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-06 22:21:56 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-06 22:21:56 -0800 |
commit | ab1cf511da33bfcb3edac7b589ead945a8dac9f0 (patch) | |
tree | 5b63030d255a36cbe09626c64b23a44552b6489a /src/com/android/camera/ui | |
parent | fe724b64cb73a2929b92371adee06d9ab43d7030 (diff) | |
parent | df7e16b2d58e233c7d3cd9c49a6950b409c7c05d (diff) | |
download | android_packages_apps_Snap-ab1cf511da33bfcb3edac7b589ead945a8dac9f0.tar.gz android_packages_apps_Snap-ab1cf511da33bfcb3edac7b589ead945a8dac9f0.tar.bz2 android_packages_apps_Snap-ab1cf511da33bfcb3edac7b589ead945a8dac9f0.zip |
Merge "SnapdragonCamera: Fix menu is covered when count down take picture"
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/CountDownView.java | 15 |
1 files changed, 15 insertions, 0 deletions
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; } |