diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-07 14:32:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-07 14:32:06 -0700 |
| commit | 8d11725675ee9f492fd75f64993fe49c6897560f (patch) | |
| tree | 7f720c4314aad43d49649422c7472171de9fdf20 /src | |
| parent | f88dd95428f256f3909c288455d4f6d19092c459 (diff) | |
| parent | 83d2a852ea8a2380ababe36ca4258d8531410509 (diff) | |
| download | android_packages_apps_Snap-8d11725675ee9f492fd75f64993fe49c6897560f.tar.gz android_packages_apps_Snap-8d11725675ee9f492fd75f64993fe49c6897560f.tar.bz2 android_packages_apps_Snap-8d11725675ee9f492fd75f64993fe49c6897560f.zip | |
Merge "SnapdragonCamera: Make camcorder switcher icon invisible."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/ui/ModuleSwitcher.java | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 837fd0e4f..99c24ec3f 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -553,6 +553,7 @@ public class PhotoUI implements PieListener, }); if (mController.isImageCaptureIntent()) { hideSwitcher(); + mSwitcher.setSwitcherVisibility(false); ViewGroup cameraControls = (ViewGroup) mRootView.findViewById(R.id.camera_controls); mActivity.getLayoutInflater().inflate(R.layout.review_module_control, cameraControls); diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java index 6c20da497..217c92a54 100644 --- a/src/com/android/camera/ui/ModuleSwitcher.java +++ b/src/com/android/camera/ui/ModuleSwitcher.java @@ -53,6 +53,7 @@ public class ModuleSwitcher extends RotateImageView public static final int LIGHTCYCLE_MODULE_INDEX = 3; public static final int GCAM_MODULE_INDEX = 4; private boolean mTouchEnabled = true; + private boolean mIsVisible = true; private static final int[] DRAW_IDS = { R.drawable.ic_switch_camera, @@ -267,9 +268,15 @@ public class ModuleSwitcher extends RotateImageView mParent.setOnTouchListener(null); } + public void setSwitcherVisibility(boolean isVisible) { + mIsVisible = isVisible; + } + public void removePopup() { mShowingPopup = false; - setVisibility(View.VISIBLE); + if (mIsVisible) { + setVisibility(View.VISIBLE); + } if (mPopup != null) { ((ViewGroup) mParent).removeView(mPopup); mPopup = null; |