diff options
| -rwxr-xr-x | jni/feature_mos/doc/feature_mos_API_doxyfile | 2 | ||||
| -rwxr-xr-x | jni/feature_stab/doc/dbreg_API_doxyfile | 2 | ||||
| -rw-r--r-- | src/com/android/camera/ui/IndicatorControlWheel.java | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/jni/feature_mos/doc/feature_mos_API_doxyfile b/jni/feature_mos/doc/feature_mos_API_doxyfile index dca8c8c0..42d692ba 100755 --- a/jni/feature_mos/doc/feature_mos_API_doxyfile +++ b/jni/feature_mos/doc/feature_mos_API_doxyfile @@ -901,7 +901,7 @@ HHC_LOCATION = # 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 dc61a9c0..17ff77ca 100755 --- a/jni/feature_stab/doc/dbreg_API_doxyfile +++ b/jni/feature_stab/doc/dbreg_API_doxyfile @@ -901,7 +901,7 @@ HHC_LOCATION = # 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 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. |