diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-05 13:57:39 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-05 13:57:39 -0800 |
commit | 15f6d966c807c371a12f68bf9f5f4e7447a9ba8e (patch) | |
tree | ea2deb2aa4d42e3c321c9340bca89c15bc3a3765 /src | |
parent | 2667c64854536d51650a8bf66faae35e1e420979 (diff) | |
parent | 1cd619462687108bac30d876a4ab8c2a195231cd (diff) | |
download | android_packages_apps_Snap-15f6d966c807c371a12f68bf9f5f4e7447a9ba8e.tar.gz android_packages_apps_Snap-15f6d966c807c371a12f68bf9f5f4e7447a9ba8e.tar.bz2 android_packages_apps_Snap-15f6d966c807c371a12f68bf9f5f4e7447a9ba8e.zip |
Merge "SnapdragonCamera: Fix ANR caused by layout logic" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rw-r--r--[-rwxr-xr-x] | src/com/android/camera/ui/OneUICameraControls.java | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java index 866bf6056..a79211c42 100755..100644 --- a/src/com/android/camera/ui/OneUICameraControls.java +++ b/src/com/android/camera/ui/OneUICameraControls.java @@ -249,26 +249,32 @@ public class OneUICameraControls extends RotatableLayout { } @Override + public void onSizeChanged(int w, int h, int oldw, int oldh){ + super.onSizeChanged(w, h, oldw, oldh); + + mWidth = w; + mHeight = h; + if(mMakeupSeekBar != null) { + mMakeupSeekBar.setMinimumWidth(mWidth/2); + } + ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(mWidth/ 4,mWidth/4); + mExposureLayout.setLayoutParams(lp); + mManualLayout.setLayoutParams(lp); + mWhiteBalanceLayout.setLayoutParams(lp); + mIsoLayout.setLayoutParams(lp); + + } + + @Override public void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); r = r - l; b = b - t; l = 0; t = 0; - mWidth = r; - mHeight = b; + setLocation(r - l, b - t); layoutRemaingPhotos(); - if(mMakeupSeekBar != null) { - mMakeupSeekBar.setMinimumWidth(mWidth/2); - } - - LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(mWidth/ 4,mWidth/4); - mExposureLayout.setLayoutParams(lp); - - mManualLayout.setLayoutParams(lp); - mWhiteBalanceLayout.setLayoutParams(lp); - mIsoLayout.setLayoutParams(lp); initializeProMode(mProModeOn); } |