1 files changed, 26 insertions, 29 deletions

diff --git a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
index 406c5263c..418e3cdd2 100644
--- a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
+++ b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
@@ -16,7 +16,6 @@
 
 package com.android.gallery3d.common;
 
-import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.hardware.Camera;
@@ -36,6 +35,7 @@ public class ApiHelper {
         public static final int ICE_CREAM_SANDWICH = 14;
         public static final int ICE_CREAM_SANDWICH_MR1 = 15;
         public static final int JELLY_BEAN = 16;
+        public static final int JELLY_BEAN_MR1 = 17;
     }
 
     public static final boolean ENABLE_PHOTO_EDITOR =
@@ -75,9 +75,6 @@ public class ApiHelper {
     public static final boolean HAS_AUTO_FOCUS_MOVE_CALLBACK =
             Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN;
 
-    public static final boolean HAS_ACTIVITY_INVALIDATE_OPTIONS_MENU =
-            hasMethod(Activity.class, "invalidateOptionsMenu");
-
     public static final boolean HAS_REMOTE_VIEWS_SERVICE =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
 
@@ -109,8 +106,8 @@ public class ApiHelper {
     public static final boolean HAS_MEDIA_ACTION_SOUND =
             Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN;
 
-    public static final boolean HAS_PANORAMA =
-            Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
+    public static final boolean HAS_OLD_PANORAMA =
+            Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH;
 
     public static final boolean HAS_TIME_LAPSE_RECORDING =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
@@ -130,46 +127,46 @@ public class ApiHelper {
     public static final boolean HAS_MOTION_EVENT_TRANSFORM =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
 
-    public static final boolean HAS_SHARE_ACTION_PROVIDER =
-            Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH;
-
-    public static final boolean HAS_EFFECTS_RECORDING =
-            Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN;
+    public static final boolean HAS_EFFECTS_RECORDING = false;
 
     public static final boolean HAS_GET_SUPPORTED_VIDEO_SIZE =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
 
-    public static int getIntFieldIfExists(Class<?> klass, String fieldName,
-            Class<?> obj, int defaultVal) {
-        try {
-            Field f = klass.getDeclaredField(fieldName);
-            return f.getInt(obj);
-        } catch (Exception e) {
-            return defaultVal;
-        }
-    }
-
     public static final boolean HAS_SET_ICON_ATTRIBUTE =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
 
-    public static final boolean HAS_ACTION_BAR_SET_LOGO =
-            Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH;
-
-    public static final boolean HAS_ACTION_BAR_SET_HOME_BUTTON_ENABLED =
-            Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH;
-
     public static final boolean HAS_MEDIA_PROVIDER_FILES_TABLE =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
 
     public static final boolean HAS_SURFACE_TEXTURE_RECORDING =
             Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN;
 
-    public static final boolean HAS_MENU_ITEM_SHOW_AS_ACTION =
+    public static final boolean HAS_ACTION_BAR =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
 
-    public static final boolean HAS_ACTION_BAR =
+    // Ex: View.setTranslationX.
+    public static final boolean HAS_VIEW_TRANSFORM_PROPERTIES =
             Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
 
+    public static final boolean HAS_CAMERA_HDR =
+            Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1;
+
+    public static final boolean CAN_START_PREVIEW_IN_JPEG_CALLBACK =
+            Build.VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH;
+
+    public static final boolean CAN_USE_FLAG_SECURE =
+            Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
+
+    public static int getIntFieldIfExists(Class<?> klass, String fieldName,
+            Class<?> obj, int defaultVal) {
+        try {
+            Field f = klass.getDeclaredField(fieldName);
+            return f.getInt(obj);
+        } catch (Exception e) {
+            return defaultVal;
+        }
+    }
+
     private static boolean hasField(Class<?> klass, String fieldName) {
         try {
             klass.getDeclaredField(fieldName);