diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-19 17:50:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-19 17:50:17 -0700 |
| commit | 9a663f7de4fa42ebbdf1ddaa5ee73ee9a7347f55 (patch) | |
| tree | fa1b83786f92d002d3963140071636827aec8178 | |
| parent | f5125ae4b327dc108d93fb061cff530ddd2500b7 (diff) | |
| parent | 41fff6e73898387612b17737085ad2321a2727c4 (diff) | |
| download | LegacyCamera-9a663f7de4fa42ebbdf1ddaa5ee73ee9a7347f55.zip LegacyCamera-9a663f7de4fa42ebbdf1ddaa5ee73ee9a7347f55.tar.gz LegacyCamera-9a663f7de4fa42ebbdf1ddaa5ee73ee9a7347f55.tar.bz2 | |
am 41fff6e7: am e2eebff5: Fix NPE in capture intent of phone UI.
* commit '41fff6e73898387612b17737085ad2321a2727c4':
Fix NPE in capture intent of phone UI.
| -rw-r--r-- | src/com/android/camera/Camera.java | 9 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index bfe6963..790e3ca 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1035,11 +1035,10 @@ public class Camera extends ActivityBase implements View.OnClickListener, if (mIsImageCaptureIntent) { setupCaptureParams(); - View reviewControl = findViewById(R.id.review_control); - reviewControl.setVisibility(View.VISIBLE); - reviewControl.findViewById(R.id.btn_cancel).setOnClickListener(this); - reviewControl.findViewById(R.id.btn_retake).setOnClickListener(this); - reviewControl.findViewById(R.id.btn_done).setOnClickListener(this); + findViewById(R.id.review_control).setVisibility(View.VISIBLE); + findViewById(R.id.btn_cancel).setOnClickListener(this); + findViewById(R.id.btn_retake).setOnClickListener(this); + findViewById(R.id.btn_done).setOnClickListener(this); } else { mSwitcher = (SwitcherSet) findViewById(R.id.camera_switch); mSwitcher.setVisibility(View.VISIBLE); diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index c1cc152..7c65c36 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -375,10 +375,10 @@ public class VideoCamera extends ActivityBase mReviewControl = findViewById(R.id.review_control); mReviewControl.setVisibility(View.VISIBLE); - mReviewControl.findViewById(R.id.btn_cancel).setOnClickListener(this); - mReviewControl.findViewById(R.id.btn_done).setOnClickListener(this); + findViewById(R.id.btn_cancel).setOnClickListener(this); + findViewById(R.id.btn_done).setOnClickListener(this); findViewById(R.id.btn_play).setOnClickListener(this); - View retake = mReviewControl.findViewById(R.id.btn_retake); + View retake = findViewById(R.id.btn_retake); retake.setOnClickListener(this); if (retake instanceof ImageView) { ((ImageView) retake).setImageResource(R.drawable.btn_ic_review_retake_video); |