diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-10-12 09:50:47 -0700 |
|---|---|---|
| committer | Jack Yoo <jyoo@codeaurora.org> | 2016-10-20 11:24:37 -0700 |
| commit | e5638a1b4697191588438be133102f61b67a3985 (patch) | |
| tree | b127b3484af48db5d576d320b3807250fc190166 /src/com/android/camera/CaptureUI.java | |
| parent | c250484c375484e70a1c8e64eb8bd956b3f1c15d (diff) | |
| download | android_packages_apps_Snap-e5638a1b4697191588438be133102f61b67a3985.tar.gz android_packages_apps_Snap-e5638a1b4697191588438be133102f61b67a3985.tar.bz2 android_packages_apps_Snap-e5638a1b4697191588438be133102f61b67a3985.zip | |
SnapdragonCamera: PanoramaUI and filter change
1. Adjusting Panorama UI
2. Adjusting Chormaflash filter
3. Changing Ubifocus focus timeout value
4. ZSL Flash mode change
Change-Id: Ia46fdc827cd5529a8b7c6f5cfafc44bb3cf00d06
CRs-Fixed: 1080317
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
| -rw-r--r-- | src/com/android/camera/CaptureUI.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index ffec736b8..1710dc975 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -248,7 +248,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mSceneModeSwitcher = mRootView.findViewById(R.id.scene_mode_switcher); mFrontBackSwitcher = mRootView.findViewById(R.id.front_back_switcher); mMakeupButton = (ImageView) mRootView.findViewById(R.id.ts_makeup_switcher); - setMakeupButtonIcon(); mMakeupSeekBarLayout = mRootView.findViewById(R.id.makeup_seekbar_layout); mSeekbarBody = mRootView.findViewById(R.id.seekbar_body); mSeekbarToggleButton = (Button) mRootView.findViewById(R.id.seekbar_toggle); @@ -282,6 +281,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, toggleMakeup(); } }); + setMakeupButtonIcon(); mFlashButton = (FlashToggleButton) mRootView.findViewById(R.id.flash_button); initFilterModeButton(); initSceneModeButton(); @@ -388,6 +388,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void run() { if(value != null && !value.equals("0")) { mMakeupButton.setImageResource(R.drawable.beautify_on); + mMakeupSeekBarLayout.setVisibility(View.VISIBLE); } else { mMakeupButton.setImageResource(R.drawable.beautify); } |