diff options
| author | Angus Kong <shkong@google.com> | 2013-08-19 15:06:12 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-09-04 13:10:29 -0700 |
| commit | ed15d1a140986473bbe7fffd72ec9618c41c5979 (patch) | |
| tree | ad5a3fdff05b54fef1ec076d5fa4c80e1a419888 /src/com/android/camera/PhotoUI.java | |
| parent | 269c824d720b2e902c4ad6c3bb23422644da1f41 (diff) | |
| download | android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.gz android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.bz2 android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.zip | |
Bring back wide angle panorama.
bug:10293937
Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index ea0037db2..73840ab06 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -26,10 +26,7 @@ import android.graphics.SurfaceTexture; import android.graphics.drawable.ColorDrawable; import android.hardware.Camera; import android.hardware.Camera.Face; -import android.hardware.Camera.Size; import android.os.AsyncTask; -import android.os.Handler; -import android.os.Message; import android.util.Log; import android.view.Gravity; import android.view.TextureView; @@ -45,12 +42,11 @@ import android.widget.Toast; import com.android.camera.CameraPreference.OnPreferenceChangedListener; import com.android.camera.FocusOverlayManager.FocusUI; +import com.android.camera.ui.ModuleSwitcher; import com.android.camera.util.ApiHelper; import com.android.camera.ui.AbstractSettingPopup; import com.android.camera.ui.CameraControls; import com.android.camera.ui.CameraRootView; -import com.android.camera.ui.CameraSwitcher; -import com.android.camera.ui.CameraSwitcher.CameraSwitchListener; import com.android.camera.ui.CountDownView; import com.android.camera.ui.CountDownView.OnCountDownFinishedListener; import com.android.camera.ui.FaceView; @@ -92,7 +88,7 @@ public class PhotoUI implements PieListener, private View mMenuButton; private PhotoMenu mMenu; - private CameraSwitcher mSwitcher; + private ModuleSwitcher mSwitcher; private CameraControls mCameraControls; private AlertDialog mLocationDialog; @@ -196,8 +192,8 @@ public class PhotoUI implements PieListener, initIndicators(); mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button); - mSwitcher = (CameraSwitcher) mRootView.findViewById(R.id.camera_switcher); - mSwitcher.setCurrentIndex(CameraSwitcher.PHOTO_MODULE_INDEX); + mSwitcher = (ModuleSwitcher) mRootView.findViewById(R.id.camera_switcher); + mSwitcher.setCurrentIndex(ModuleSwitcher.PHOTO_MODULE_INDEX); mSwitcher.setSwitchListener(mActivity); mMenuButton = mRootView.findViewById(R.id.menu); if (ApiHelper.HAS_FACE_DETECTION) { |