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/VideoMenu.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/VideoMenu.java')
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 2e34f2446..f8d1f8eff 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -506,15 +506,7 @@ public class VideoMenu extends MenuController 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 @@ -892,6 +884,7 @@ public class VideoMenu extends MenuController } setPreference(CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, defaultValue); } + super.onSettingChanged(pref); } |