summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PanoramaModule.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/PanoramaModule.java')
-rw-r--r--src/com/android/camera/PanoramaModule.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/camera/PanoramaModule.java b/src/com/android/camera/PanoramaModule.java
index 4edc68657..d12c8286e 100644
--- a/src/com/android/camera/PanoramaModule.java
+++ b/src/com/android/camera/PanoramaModule.java
@@ -714,13 +714,13 @@ public class PanoramaModule implements CameraModule,
}
private void createContentView() {
- mActivity.getLayoutInflater().inflate(R.layout.panorama_module, (ViewGroup) mRootView);
+ mActivity.getLayoutInflater().inflate(R.layout.panorama_module, (ViewGroup) mRootView, true);
Resources appRes = mActivity.getResources();
- mCaptureLayout = (LinearLayout) mRootView.findViewById(R.id.camera_app_root);
+ mCaptureLayout = (LinearLayout) mRootView.findViewById(R.id.camera_app);
mIndicatorColor = appRes.getColor(R.color.pano_progress_indication);
mReviewBackground = appRes.getColor(R.color.review_background);
mIndicatorColorFast = appRes.getColor(R.color.pano_progress_indication_fast);
- mPanoLayout = (ViewGroup) mRootView.findViewById(R.id.pano_layout);
+ mPanoLayout = (ViewGroup) mRootView.findViewById(R.id.camera_app_root);
mRotateDialog = new RotateDialogController(mActivity, R.layout.rotate_dialog);
setViews(appRes);
}
@@ -1308,6 +1308,11 @@ public class PanoramaModule implements CameraModule,
}
@Override
+ public boolean needsPieMenu() {
+ return false;
+ }
+
+ @Override
public void onShowSwitcherPopup() {
}