diff options
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/app/CameraApp.java | 12 |
2 files changed, 18 insertions, 5 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); diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java index ffb674bd3..831ed974c 100644 --- a/src/com/android/camera/app/CameraApp.java +++ b/src/com/android/camera/app/CameraApp.java @@ -16,6 +16,7 @@ package com.android.camera.app; +import android.app.ActivityManager; import android.app.Application; import com.android.camera.SDCard; @@ -23,10 +24,19 @@ import com.android.camera.util.CameraUtil; import com.android.camera.util.UsageStatistics; public class CameraApp extends Application { - + private static long mMaxSystemMemory; + public static boolean mIsLowMemoryDevice = false; + private static final int LOW_MEMORY_DEVICE_THRESHOLD = 1024*1024*1024; @Override public void onCreate() { super.onCreate(); + ActivityManager actManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE); + ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo(); + actManager.getMemoryInfo(memInfo); + mMaxSystemMemory = memInfo.totalMem; + if(mMaxSystemMemory <= LOW_MEMORY_DEVICE_THRESHOLD) { + mIsLowMemoryDevice = true; + } UsageStatistics.initialize(this); CameraUtil.initialize(this); SDCard.initialize(this); |