summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2016-09-07 14:12:49 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-08 23:50:18 -0700
commit3455e9b489d9d47097df77a7845177407eb29f4f (patch)
tree07952604d8dce63b497c1341250760ce19315310 /res
parent050fe78517519b689ce5adff1cf2c074bcbd186e (diff)
downloadandroid_packages_apps_Snap-3455e9b489d9d47097df77a7845177407eb29f4f.tar.gz
android_packages_apps_Snap-3455e9b489d9d47097df77a7845177407eb29f4f.tar.bz2
android_packages_apps_Snap-3455e9b489d9d47097df77a7845177407eb29f4f.zip
SnapdragonCamera:Fix Camera FC in split screen
When camera launched in in split screen, it shows in landscape, but ImageViews in the land layout of CameraControls are not RotateImageViews, exception occurred when CameraControls.setOrientation is invoked. Change them to RotateImageViews to avoid exceptions. Change-Id: I6fe0c04e2a6f1c4726a35adba697fbffbac5c0bd CRs-Fixed: 1063479
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/review_module_control.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/layout-land/review_module_control.xml b/res/layout-land/review_module_control.xml
index 9f8b0cd46..d740eec7d 100644
--- a/res/layout-land/review_module_control.xml
+++ b/res/layout-land/review_module_control.xml
@@ -18,7 +18,7 @@
style="@style/CameraControls"
android:layout_gravity="right|center_vertical"
android:layout_marginRight="2dip">
- <ImageView android:id="@+id/btn_done"
+ <com.android.camera.ui.RotateImageView android:id="@+id/btn_done"
style="@style/ReviewControlIcon"
android:contentDescription="@string/accessibility_review_ok"
android:visibility="gone"
@@ -27,7 +27,7 @@
android:background="@drawable/bg_pressed"
android:src="@drawable/ic_menu_done_holo_light" />
- <ImageView android:id="@+id/btn_retake"
+ <com.android.camera.ui.RotateImageView android:id="@+id/btn_retake"
style="@style/ReviewControlIcon"
android:contentDescription="@string/accessibility_review_retake"
android:layout_gravity="right|center_vertical"
@@ -37,7 +37,7 @@
android:background="@drawable/bg_pressed"
android:src="@drawable/ic_btn_shutter_retake" />
- <ImageView android:id="@+id/btn_cancel"
+ <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel"
style="@style/ReviewControlIcon"
android:contentDescription="@string/accessibility_review_cancel"
android:visibility="gone"