diff options
| author | Raman Tenneti <rtenneti@google.com> | 2020-08-13 16:49:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-13 16:49:04 +0000 |
| commit | 8764b24fc11e1d125b89bb514d2e613c271862e9 (patch) | |
| tree | 73d2d8f0bcc952bae85a3fe226e53fe748df828c | |
| parent | 94b28cf19fcff0baa172ba8c1aa7977a69cf59d0 (diff) | |
| parent | ef10818f63bbdb42b50472b866be16bdaedc086f (diff) | |
| download | LegacyCamera-8764b24fc11e1d125b89bb514d2e613c271862e9.tar.gz | |
Merge "Menu of Camera App is all gone" am: eae7899598 am: 5cedf450bb am: 2ccc28dbb2 am: ec627a63c4 am: ef10818f63
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/977011
Change-Id: I511f76b77c41ab32ba0a7351f8d855c6e28b1116
| -rw-r--r-- | src/com/android/camera/ui/IndicatorControlWheel.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java index 09483466..223a9d4b 100644 --- a/src/com/android/camera/ui/IndicatorControlWheel.java +++ b/src/com/android/camera/ui/IndicatorControlWheel.java @@ -163,9 +163,16 @@ public class IndicatorControlWheel extends IndicatorControl implements setPreferenceGroup(group); // Add the ZoomControl if supported. + mZoomControl = (ZoomControlWheel) findViewById(R.id.zoom_control); if (isZoomSupported) { - mZoomControl = (ZoomControlWheel) findViewById(R.id.zoom_control); mZoomControl.setVisibility(View.VISIBLE); + } else { + // ZoomControlWheel is default added in res/layout-sw600dp/camera_control.xml, + // If zoom not supported, should remove this view, or the radians of other view + // will be calculated incorrectly, thus control wheel show abnormal. + if (mZoomControl != null) { + removeView(mZoomControl); + } } // Add CameraPicker. |