diff options
| author | Erin Dahlgren <edahlgren@google.com> | 2014-01-07 23:11:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-07 23:11:34 +0000 |
| commit | 37b9f92c89d6d130bd54892c157bc6b614110daf (patch) | |
| tree | b6e91ea524f4dc23d7bf06bdd6a3f82cea27ec66 /src/com/android/camera/PhotoUI.java | |
| parent | a3ea885b11b13fc86bc750e09355313c644d2178 (diff) | |
| parent | 1848494bd09c85002d8c59d4feb8a6e0dc32871f (diff) | |
| download | android_packages_apps_Camera2-37b9f92c89d6d130bd54892c157bc6b614110daf.tar.gz android_packages_apps_Camera2-37b9f92c89d6d130bd54892c157bc6b614110daf.tar.bz2 android_packages_apps_Camera2-37b9f92c89d6d130bd54892c157bc6b614110daf.zip | |
Merge "Show onscreen indicators for enabled and visible options." into gb-ub-photos-denali
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 415102d55..50ae81ede 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -317,20 +317,20 @@ public class PhotoUI implements PreviewStatusListener, private void setupToggleButtons() { ButtonManager buttonManager = mActivity.getButtonManager(); - buttonManager.enableButton(ButtonManager.BUTTON_CAMERA, R.id.camera_toggle_button, + buttonManager.enableButton(ButtonManager.BUTTON_CAMERA, mCameraCallback, R.array.camera_id_icons); - buttonManager.enableButton(ButtonManager.BUTTON_FLASH, R.id.flash_toggle_button, + buttonManager.enableButton(ButtonManager.BUTTON_FLASH, null, R.array.camera_flashmode_icons); if (mActivity.getCurrentModuleIndex() == ModeListView.MODE_PHOTO) { // Simple photo mode. - buttonManager.hideButton(ButtonManager.BUTTON_HDRPLUS, R.id.hdr_plus_toggle_button); - buttonManager.hideButton(ButtonManager.BUTTON_REFOCUS, R.id.refocus_toggle_button); + buttonManager.hideButton(ButtonManager.BUTTON_HDRPLUS); + buttonManager.hideButton(ButtonManager.BUTTON_REFOCUS); } else { // Advanced photo mode. - buttonManager.enableButton(ButtonManager.BUTTON_HDRPLUS, R.id.hdr_plus_toggle_button, + buttonManager.enableButton(ButtonManager.BUTTON_HDRPLUS, mHdrCallback, R.array.pref_camera_hdr_plus_icons); - buttonManager.enableButton(ButtonManager.BUTTON_REFOCUS, R.id.refocus_toggle_button, + buttonManager.enableButton(ButtonManager.BUTTON_REFOCUS, mRefocusCallback, R.array.refocus_icons); } } @@ -338,11 +338,11 @@ public class PhotoUI implements PreviewStatusListener, private void setupIntentToggleButtons() { setupToggleButtons(); ButtonManager buttonManager = mActivity.getButtonManager(); - buttonManager.enablePushButton(ButtonManager.BUTTON_CANCEL, R.id.cancel_button, + buttonManager.enablePushButton(ButtonManager.BUTTON_CANCEL, mCancelCallback); - buttonManager.enablePushButton(ButtonManager.BUTTON_DONE, R.id.done_button, + buttonManager.enablePushButton(ButtonManager.BUTTON_DONE, mDoneCallback); - buttonManager.enablePushButton(ButtonManager.BUTTON_RETAKE, R.id.retake_button, + buttonManager.enablePushButton(ButtonManager.BUTTON_RETAKE, mRetakeCallback); } |