diff options
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 2309ce988..3be35ea95 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -49,6 +49,7 @@ import android.widget.FrameLayout.LayoutParams; import com.android.camera.CameraPreference.OnPreferenceChangedListener; import com.android.camera.TsMakeupManager.MakeupLevelListener; +import com.android.camera.app.CameraApp; import com.android.camera.ui.CameraControls; import com.android.camera.ui.CountdownTimerPopup; import com.android.camera.ui.ListSubMenu; @@ -1017,7 +1018,6 @@ public class PhotoMenu extends MenuController final View[] views = new View[entries.length]; int init = pref.getCurrentIndex(); for (int i = 0; i < entries.length; i++) { - RotateLayout layout2 = (RotateLayout) inflater.inflate( R.layout.scene_mode_view, null, false); @@ -1061,13 +1061,16 @@ public class PhotoMenu extends MenuController // ASD only available when developer options are enabled. if(entryValues[i].equals("asd")) { layout2.setVisibility(mActivity.isDeveloperMenuEnabled()?View.VISIBLE:View.GONE); - } - - if(entryValues[i].equals("hdr")) { + } else if(entryValues[i].equals("hdr")) { ListPreference autoHdrPref = mPreferenceGroup.findPreference(CameraSettings.KEY_AUTO_HDR); if (autoHdrPref != null && autoHdrPref.getValue().equalsIgnoreCase("enable")) { layout2.setVisibility(View.GONE); } + } else if(CameraApp.mIsLowMemoryDevice && + (entryValues[i].equals(mActivity.getResources().getString(R.string.pref_camera_advanced_feature_value_refocus_on)) + || + entryValues[i].equals(mActivity.getResources().getString(R.string.pref_camera_advanced_feature_value_optizoom_on)))) { + layout2.setVisibility(View.GONE); } } previewMenuLayout.addView(basic); |