OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55d5b4a
)
When we reset app ui, re-enable shutter button.
author
Seth Raphael
<magicseth@google.com>
Wed, 2 Apr 2014 21:46:03 +0000
(14:46 -0700)
committer
Seth Raphael
<magicseth@google.com>
Wed, 2 Apr 2014 21:49:59 +0000
(14:49 -0700)
This allows all modules to have a known state on
resume.
Change-Id: I8efab600b7c6df611e522bb20c8a164006a27a9d
src/com/android/camera/app/CameraAppUI.java
patch
|
blob
|
history
diff --git
a/src/com/android/camera/app/CameraAppUI.java
b/src/com/android/camera/app/CameraAppUI.java
index
5a8547f
..
8a6465b
100644
(file)
--- a/
src/com/android/camera/app/CameraAppUI.java
+++ b/
src/com/android/camera/app/CameraAppUI.java
@@
-1166,6
+1166,7
@@
public class CameraAppUI implements ModeListView.ModeSwitchListener,
removeShutterListener(mController.getCurrentModuleController());
mTutorialsPlaceholder.removeAllViews();
+ setShutterButtonEnabled(true);
mPreviewStatusListener = null;
mPreviewOverlay.reset();
mFocusOverlay.setVisibility(View.INVISIBLE);