summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-09-29 14:42:48 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-09-29 14:42:48 -0700
commitbfafad4ed983c9a5332b1e23cace941a29dbb18e (patch)
tree1ed4daceb749529f4438a0ba9e3719c9e100664b /src/com/android/camera/ui
parentaca743cbd3979f1d24cc5740a6e430b88c00923a (diff)
parentabadcc3fb25f352829fdd1dc9330e1020a8f317c (diff)
downloadandroid_packages_apps_Snap-bfafad4ed983c9a5332b1e23cace941a29dbb18e.tar.gz
android_packages_apps_Snap-bfafad4ed983c9a5332b1e23cace941a29dbb18e.tar.bz2
android_packages_apps_Snap-bfafad4ed983c9a5332b1e23cace941a29dbb18e.zip
Merge "SnapdragonCamera: Touch not working on camera after tapping on settings."
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r--src/com/android/camera/ui/CameraControls.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index fe6de5351..b1278536c 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -465,6 +465,18 @@ public class CameraControls extends RotatableLayout {
mPreview.setY(mLocY[idx1][PREVIEW_INDEX] - y);
}
+ public void setTitleBarVisibility(int status){
+ mFrontBackSwitcher.setVisibility(status);
+ mMenu.setVisibility(status);
+ mSceneModeSwitcher.setVisibility(status);
+ mFilterModeSwitcher.setVisibility(status);
+ if(TsMakeupManager.HAS_TS_MAKEUP) {
+ mTsMakeupSwitcher.setVisibility(status);
+ } else {
+ mHdrSwitcher.setVisibility(status);
+ }
+ }
+
public void hideUI() {
isAnimating = true;
enableTouch(false);