summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2018-06-27 16:24:47 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-06-28 00:02:33 -0700
commiteb2cfffc1ccddfd2bbc87a4516320d1f941daf66 (patch)
tree7c68e3c700433eedbd8e37bc150b03753f1f8f1d
parentf77535628448dc8722a6686438de9fc026b8d9cd (diff)
downloadandroid_packages_apps_Snap-eb2cfffc1ccddfd2bbc87a4516320d1f941daf66.tar.gz
android_packages_apps_Snap-eb2cfffc1ccddfd2bbc87a4516320d1f941daf66.tar.bz2
android_packages_apps_Snap-eb2cfffc1ccddfd2bbc87a4516320d1f941daf66.zip
SnapdragonCamera:Fix CTS issue
Change the id of the review done button to match the requirement of CTS test Change-Id: I93859d78fa64a7fe9baad72019932e99833fb268 CRs-Fixed: 2226102
-rwxr-xr-xres/layout/capture_module.xml2
-rwxr-xr-xsrc/com/android/camera/CaptureUI.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index a9c8f88e5..008f62e16 100755
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -182,7 +182,7 @@
style="@style/CameraControls"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="2dip">
- <com.android.camera.ui.RotateImageView android:id="@+id/preview_btn_done"
+ <com.android.camera.ui.RotateImageView android:id="@+id/done_button"
style="@style/ReviewControlIcon"
android:contentDescription="@string/accessibility_review_ok"
android:scaleType="center"
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 0edc4606e..ccb45e12d 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -469,7 +469,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mCameraControls.setVideoMode(false);
mCancelButton.setVisibility(View.VISIBLE);
mReviewCancelButton = mRootView.findViewById(R.id.preview_btn_cancel);
- mReviewDoneButton = mRootView.findViewById(R.id.preview_btn_done);
+ mReviewDoneButton = mRootView.findViewById(R.id.done_button);
mReviewRetakeButton = mRootView.findViewById(R.id.preview_btn_retake);
mReviewPlayButton = mRootView.findViewById(R.id.preview_play);
mPreviewLayout = (FrameLayout)mRootView.findViewById(R.id.preview_of_intent);