Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged
Bug: 166295507
Merged-In: Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a
Change-Id: Iac3475e1d2188085d6d87412f7b9d1304521f573
diff --git a/jni/feature_mos/doc/feature_mos_API_doxyfile b/jni/feature_mos/doc/feature_mos_API_doxyfile
index dca8c8c..42d692b 100755
--- a/jni/feature_mos/doc/feature_mos_API_doxyfile
+++ b/jni/feature_mos/doc/feature_mos_API_doxyfile
@@ -901,7 +901,7 @@
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# it should be included in the primary .chm file (NO).
GENERATE_CHI = NO
diff --git a/jni/feature_stab/doc/dbreg_API_doxyfile b/jni/feature_stab/doc/dbreg_API_doxyfile
index dc61a9c..17ff77c 100755
--- a/jni/feature_stab/doc/dbreg_API_doxyfile
+++ b/jni/feature_stab/doc/dbreg_API_doxyfile
@@ -901,7 +901,7 @@
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# it should be included in the primary .chm file (NO).
GENERATE_CHI = NO
diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index 0948346..223a9d4 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -163,9 +163,16 @@
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.
