summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominggoes Isakh <drjisakh@gmail.com>2017-03-26 19:30:35 +0200
committerDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2017-04-04 16:27:27 +0000
commita8285adbba49868378f795a6f37401b9334061c4 (patch)
tree4beaaefae30c5de53a2b7e01123a5ffceae7f3e0
parent65aa6fdd3684ddd6821a0f82a3c488899ca6f278 (diff)
downloadandroid_packages_apps_Snap-a8285adbba49868378f795a6f37401b9334061c4.tar.gz
android_packages_apps_Snap-a8285adbba49868378f795a6f37401b9334061c4.tar.bz2
android_packages_apps_Snap-a8285adbba49868378f795a6f37401b9334061c4.zip
Snap: Fix effect and picture program overlay buttons
When you switch between front and back camera, the camera with the least features removes the overlay buttons causing the other camera not able to use the supported features. BUGBASH-320 Change-Id: I500d48c42ac5797aa1a44664f58057ad4f8189c3
-rw-r--r--src/com/android/camera/PhotoMenu.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 72b282f2b..9b26b8195 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -901,9 +901,10 @@ public class PhotoMenu extends MenuController
final IconListPreference pref = (IconListPreference) mPreferenceGroup
.findPreference(CameraSettings.KEY_SCENE_MODE);
if (pref == null) {
- mUI.removeControlView(button);
+ button.setVisibility(View.GONE);
return;
}
+ button.setVisibility(View.VISIBLE);
updateSceneModeIcon(pref);
button.setOnClickListener(new OnClickListener() {
@Override
@@ -1044,9 +1045,10 @@ public class PhotoMenu extends MenuController
final IconListPreference pref = (IconListPreference) mPreferenceGroup
.findPreference(CameraSettings.KEY_COLOR_EFFECT);
if (pref == null || pref.getValue() == null) {
- mUI.removeControlView(button);
+ button.setVisibility(View.GONE);
return;
}
+ button.setVisibility(View.VISIBLE);
changeFilterModeControlIcon(pref.getValue());
button.setOnClickListener(new OnClickListener() {
@Override