summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2011-11-14 09:14:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-14 09:14:31 -0800
commitc2b3d0008432c06ce43a4d93fa1fde1343a6dc65 (patch)
tree9b255874d8a353bc7b973b8f9bc1e993a25977f3
parent657537f9c9c581c9d63a372ceccfc02e42112ae5 (diff)
parent562db5a0ec57f65cf4014ce3f7dad0f9324bb2f1 (diff)
downloadLegacyCamera-c2b3d0008432c06ce43a4d93fa1fde1343a6dc65.zip
LegacyCamera-c2b3d0008432c06ce43a4d93fa1fde1343a6dc65.tar.gz
LegacyCamera-c2b3d0008432c06ce43a4d93fa1fde1343a6dc65.tar.bz2
Merge "Fix too small panorama review on phones." into ics-mr1
-rw-r--r--res/layout/pano_review.xml14
-rwxr-xr-xsrc/com/android/camera/panorama/PanoramaActivity.java1
2 files changed, 10 insertions, 5 deletions
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index fa4f83b..7b9a92e 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -50,11 +50,15 @@
</com.android.camera.ui.RotateLayout>
</RelativeLayout>
- <ImageView android:id="@+id/pano_reviewarea"
- android:rotation="90"
- android:scaleType="fitCenter"
- android:layout_height="match_parent"
- android:layout_width="@dimen/pano_mosaic_surface_height" />
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/pano_rotate_reviewarea"
+ android:layout_width="@dimen/pano_mosaic_surface_height"
+ android:layout_height="match_parent">
+ <ImageView android:id="@+id/pano_reviewarea"
+ android:scaleType="fitCenter"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent" />
+ </com.android.camera.ui.RotateLayout>
<LinearLayout android:id="@+id/pano_review_control"
style="@style/PanoViewHorizontalBar"
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index a65d263..fe70827 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -710,6 +710,7 @@ public class PanoramaActivity extends ActivityBase implements
(Rotatable) findViewById(R.id.pano_review_saving_indication_layout),
(Rotatable) findViewById(R.id.pano_saving_progress_bar_layout),
(Rotatable) findViewById(R.id.pano_review_cancel_button_layout),
+ (Rotatable) findViewById(R.id.pano_rotate_reviewarea),
(Rotatable) mRotateDialog,
(Rotatable) mCaptureIndicator,
(Rotatable) mModePicker,