diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-06 22:21:57 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-06 22:21:57 -0800 |
| commit | dcbe8fe126580129c198b410a537c89ac5c2f480 (patch) | |
| tree | d3719b8e8b5b223a85527e0850ac9348f29d6435 | |
| parent | ab1cf511da33bfcb3edac7b589ead945a8dac9f0 (diff) | |
| parent | 03e1f97889d183f547deef8bbcd362d40a7c23f2 (diff) | |
| download | android_packages_apps_Snap-dcbe8fe126580129c198b410a537c89ac5c2f480.tar.gz android_packages_apps_Snap-dcbe8fe126580129c198b410a537c89ac5c2f480.tar.bz2 android_packages_apps_Snap-dcbe8fe126580129c198b410a537c89ac5c2f480.zip | |
Merge "SnapdragonCamera: Fix app crash when camera not support scenemode"
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index c8522ee94..1568c32c0 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -671,7 +671,11 @@ public class PhotoMenu extends MenuController public void initSceneModeButton(View button) { button.setVisibility(View.INVISIBLE); - updateSceneModeIcon(); + final IconListPreference pref = (IconListPreference) mPreferenceGroup + .findPreference(CameraSettings.KEY_SCENE_MODE); + if (pref == null) + return; + updateSceneModeIcon(pref); button.setVisibility(View.VISIBLE); button.setOnClickListener(new OnClickListener() { @Override @@ -774,7 +778,7 @@ public class PhotoMenu extends MenuController if (System.currentTimeMillis() - startTime < CLICK_THRESHOLD) { pref.setValueIndex(j); onSettingChanged(pref); - updateSceneModeIcon(); + updateSceneModeIcon(pref); for (View v1 : views) { v1.setBackgroundResource(R.drawable.scene_mode_view_border); } @@ -799,11 +803,7 @@ public class PhotoMenu extends MenuController mPreviewMenu = basic; } - public void updateSceneModeIcon() { - final IconListPreference pref = (IconListPreference) mPreferenceGroup - .findPreference(CameraSettings.KEY_SCENE_MODE); - if (pref == null) - return; + public void updateSceneModeIcon(IconListPreference pref) { ImageView iv = (ImageView) ((FrameLayout) mSceneModeSwitcher).getChildAt(0); int[] thumbnails = pref.getThumbnailIds(); int ind = pref.getCurrentIndex(); |