diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-26 06:45:02 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-26 06:45:02 -0800 |
commit | ca6f7e139f4db45edc5e2d9b5ef7f827e1e94344 (patch) | |
tree | 9a80e70876073cf77b85eeebf861308c9e42b4ac /src | |
parent | 277c60e164e3b5a307543a5b5da8558191731cde (diff) | |
parent | 1de5c96a551b30990c776c7d70c2c091271fdf26 (diff) | |
download | android_packages_apps_Snap-ca6f7e139f4db45edc5e2d9b5ef7f827e1e94344.tar.gz android_packages_apps_Snap-ca6f7e139f4db45edc5e2d9b5ef7f827e1e94344.tar.bz2 android_packages_apps_Snap-ca6f7e139f4db45edc5e2d9b5ef7f827e1e94344.zip |
Merge "Snapdragon: Fix orientation of Prepare panorama dialog"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index e270165c1..230c31c86 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -49,6 +49,7 @@ import android.widget.TextView; import com.android.camera.ui.CameraControls; import com.android.camera.ui.CameraRootView; import com.android.camera.ui.ModuleSwitcher; +import com.android.camera.ui.RotateLayout; import com.android.camera.ui.RotateTextToast; import com.android.camera.util.CameraUtil; import org.codeaurora.snapcam.R; @@ -101,6 +102,7 @@ public class WideAnglePanoramaUI implements private int mOrientation; private int mPreviewYOffset; + private RotateLayout mWaitingDialog; /** Constructor. */ public WideAnglePanoramaUI( @@ -459,6 +461,7 @@ public class WideAnglePanoramaUI implements mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls); setPanoramaPreviewView(); + mWaitingDialog = (RotateLayout) mRootView.findViewById(R.id.waitingDialog); mDialogHelper = new DialogHelper(); setViews(appRes); } @@ -533,11 +536,9 @@ public class WideAnglePanoramaUI implements } private class DialogHelper { - private ProgressDialog mProgressDialog; private AlertDialog mAlertDialog; DialogHelper() { - mProgressDialog = null; mAlertDialog = null; } @@ -546,9 +547,8 @@ public class WideAnglePanoramaUI implements mAlertDialog.dismiss(); mAlertDialog = null; } - if (mProgressDialog != null) { - mProgressDialog.dismiss(); - mProgressDialog = null; + if (mWaitingDialog != null) { + mWaitingDialog.setVisibility(View.INVISIBLE); } } @@ -570,7 +570,7 @@ public class WideAnglePanoramaUI implements public void showWaitingDialog(CharSequence message) { dismissAll(); - mProgressDialog = ProgressDialog.show(mActivity, null, message, true, false); + mWaitingDialog.setVisibility(View.VISIBLE); } } @@ -683,7 +683,7 @@ public class WideAnglePanoramaUI implements FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) button.getLayoutParams(); lp.gravity = g; button.setLayoutParams(lp); - + mWaitingDialog.setRotation(-orientation); mReview.setRotation(-orientation); mTooFastPrompt.setRotation(-orientation); mCameraControls.setOrientation(orientation, animation); |