diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-01-27 17:09:15 -0800 |
|---|---|---|
| committer | Camera Software Integration <camswint@localhost> | 2016-01-30 13:01:11 -0700 |
| commit | e94a646b72e995ec12b6b9ab5bd3212b3f6e299c (patch) | |
| tree | f3f5c386467f56157f2fb5970d601c3051822fdc /src/com/android/camera/PhotoMenu.java | |
| parent | 8f30e9a0e0d0a1c55d3409877b5a188885cf5887 (diff) | |
| download | android_packages_apps_Snap-e94a646b72e995ec12b6b9ab5bd3212b3f6e299c.tar.gz android_packages_apps_Snap-e94a646b72e995ec12b6b9ab5bd3212b3f6e299c.tar.bz2 android_packages_apps_Snap-e94a646b72e995ec12b6b9ab5bd3212b3f6e299c.zip | |
SnapdragonCamera: Fix the memory leak on view.
Keep using modules instead of creating.
Don't remove the view without cleaning it.
Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0
CRs-Fixed: 958510
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 0e4db9503..22cd8823f 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1087,16 +1087,7 @@ public class PhotoMenu extends MenuController .findPreference(CameraSettings.KEY_COLOR_EFFECT); if (pref == null || pref.getValue() == null) return; - - int[] iconIds = pref.getLargeIconIds(); - int index = pref.findIndexOfValue(pref.getValue()); - int resid = -1; - if (!pref.getUseSingleIcon() && iconIds != null) { - resid = iconIds[index]; - } else { - resid = pref.getSingleIcon(); - } - ((ImageView) button).setImageResource(resid); + changeFilterModeControlIcon(pref.getValue()); button.setVisibility(View.VISIBLE); button.setOnClickListener(new OnClickListener() { @Override @@ -1450,8 +1441,8 @@ public class PhotoMenu extends MenuController } else { mHdrSwitcher.setVisibility(View.VISIBLE); } - updateFilterModeIcon(pref, pref); + super.onSettingChanged(pref); } |