diff options
| author | Erin Dahlgren <edahlgren@google.com> | 2014-01-07 11:46:57 -0800 |
|---|---|---|
| committer | Erin Dahlgren <edahlgren@google.com> | 2014-01-07 14:17:48 -0800 |
| commit | 1848494bd09c85002d8c59d4feb8a6e0dc32871f (patch) | |
| tree | febf4d34e902771c8cf6b23d7bbb7a5288727c2a /src/com/android/camera/PhotoUI.java | |
| parent | 49c47c3453242ec035b1d7d40e7cbc51f7994485 (diff) | |
| download | android_packages_apps_Camera2-1848494bd09c85002d8c59d4feb8a6e0dc32871f.tar.gz android_packages_apps_Camera2-1848494bd09c85002d8c59d4feb8a6e0dc32871f.tar.bz2 android_packages_apps_Camera2-1848494bd09c85002d8c59d4feb8a6e0dc32871f.zip | |
Show onscreen indicators for enabled and visible options.
Bug: 12434780
Change-Id: I85a3efba46303fc47f456d696d89b0ca2997f9f6
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 d799166b2..d65328d05 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -312,20 +312,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); } } @@ -333,11 +333,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); } |