diff options
| author | Abhijit Trivedi <abhijitt@quicinc.com> | 2018-11-01 15:52:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-01 15:52:35 -0700 |
| commit | 53aec1a187886e8f9ace32d0efd0515957f1b075 (patch) | |
| tree | b3bf8e655842a3a37ba0d7e5643c987e89f75b27 /src/com/android/camera/ui | |
| parent | e152edac5288306bfa17a640f7d94ea8524a16df (diff) | |
| parent | 41a5967d677bafd0ab469ee299898b844a3e551b (diff) | |
| download | android_packages_apps_Snap-53aec1a187886e8f9ace32d0efd0515957f1b075.tar.gz android_packages_apps_Snap-53aec1a187886e8f9ace32d0efd0515957f1b075.tar.bz2 android_packages_apps_Snap-53aec1a187886e8f9ace32d0efd0515957f1b075.zip | |
Merge "SnapdragonCamera: Fix UI in proMode is in disorder" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com/android/camera/ui')
| -rwxr-xr-x | src/com/android/camera/ui/OneUICameraControls.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java index 646596912..6bddf0139 100755 --- a/src/com/android/camera/ui/OneUICameraControls.java +++ b/src/com/android/camera/ui/OneUICameraControls.java @@ -582,7 +582,8 @@ public class OneUICameraControls extends RotatableLayout { } private void setProModeParameters() { - ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(mWidth/ 4, mWidth/ 4); + int width = (mWidth > mHeight) ? mHeight : mWidth; + ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(width/ 4, width/ 4); mExposureText.setLayoutParams(lp); mManualText.setLayoutParams(lp); mWhiteBalanceText.setLayoutParams(lp); |