diff options
| author | repo sync <cywang@google.com> | 2011-07-17 16:24:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-17 16:24:44 -0700 |
| commit | b4aa4791c329cadc4df8edf3def5655cf4105f56 (patch) | |
| tree | 60e5046e1e754b01e29bf7e1ff45192cca90b5f6 /src/com/android/camera/Camera.java | |
| parent | e1b7b87757cfef229162601154b0d62bbfb693a2 (diff) | |
| parent | cead50ba3ce2df3bd9fcf06c6f54ea0c6980f0d7 (diff) | |
| download | LegacyCamera-b4aa4791c329cadc4df8edf3def5655cf4105f56.zip LegacyCamera-b4aa4791c329cadc4df8edf3def5655cf4105f56.tar.gz LegacyCamera-b4aa4791c329cadc4df8edf3def5655cf4105f56.tar.bz2 | |
Merge "Make all wheel icons rotatable."
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 1183de0..d1315d4 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -605,8 +605,8 @@ public class Camera extends ActivityBase implements View.OnClickListener, } private void initializeZoomPicker() { - Button zoomIncrement = (Button) findViewById(R.id.zoom_increment); - Button zoomDecrement = (Button) findViewById(R.id.zoom_decrement); + View zoomIncrement = findViewById(R.id.zoom_increment); + View zoomDecrement = findViewById(R.id.zoom_decrement); TextView zoomRatio = (TextView) findViewById(R.id.zoom_ratio); if (zoomIncrement != null && zoomDecrement != null && mParameters.isZoomSupported()) { mZoomPicker = new ZoomPicker(this, zoomIncrement, zoomDecrement, zoomRatio); @@ -1236,6 +1236,7 @@ public class Camera extends ActivityBase implements View.OnClickListener, if (mCameraSwitchIcon != null) mCameraSwitchIcon.setDegree(degree); if (mVideoSwitchIcon != null) mVideoSwitchIcon.setDegree(degree); if (mSharePopup != null) mSharePopup.setOrientation(degree); + if (mIndicatorWheel != null) mIndicatorWheel.setDegree(degree); } @Override |