summaryrefslogtreecommitdiffstats
path: root/gallerycommon/src/com/android/gallery3d/common
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-08-26 21:34:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-26 21:34:47 -0700
commitfa3e84a0ce70f03b47c94434fdb52780a8b08e62 (patch)
treece7fd2164da273ca213c08b10c37f2f5905ca9ef /gallerycommon/src/com/android/gallery3d/common
parent3d5c7f5c79492de43dfe58b78bc97cdce1ec8dd7 (diff)
parente681d65a336c9ae79098b8a7e49cfe1e5affb695 (diff)
downloadandroid_packages_apps_Snap-fa3e84a0ce70f03b47c94434fdb52780a8b08e62.tar.gz
android_packages_apps_Snap-fa3e84a0ce70f03b47c94434fdb52780a8b08e62.tar.bz2
android_packages_apps_Snap-fa3e84a0ce70f03b47c94434fdb52780a8b08e62.zip
Merge "Uses ActionBarSherlock in Gallery" into gb-ub-photos-arches
Diffstat (limited to 'gallerycommon/src/com/android/gallery3d/common')
-rw-r--r--gallerycommon/src/com/android/gallery3d/common/ApiHelper.java16
-rw-r--r--gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java2
-rw-r--r--gallerycommon/src/com/android/gallery3d/common/Utils.java2
3 files changed, 2 insertions, 18 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java b/gallerycommon/src/com/android/gallery3d/common/ApiHelper.java
index 03181ca64..c726719a8 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;
@@ -75,9 +74,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;
@@ -130,9 +126,6 @@ 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 = false;
public static final boolean HAS_GET_SUPPORTED_VIDEO_SIZE =
@@ -141,21 +134,12 @@ public class ApiHelper {
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 =
- Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
-
public static final boolean HAS_ACTION_BAR =
Build.VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB;
diff --git a/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java b/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
index 9e327aa51..18b7a8875 100644
--- a/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
+++ b/gallerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
@@ -121,7 +121,7 @@ public final class HttpClientFactory {
Build.DEVICE,
Build.MODEL,
Build.ID,
- Build.VERSION.SDK,
+ Build.VERSION.SDK_INT,
Build.VERSION.RELEASE,
Build.VERSION.INCREMENTAL);
}
diff --git a/gallerycommon/src/com/android/gallery3d/common/Utils.java b/gallerycommon/src/com/android/gallery3d/common/Utils.java
index 391b22535..f5a266706 100644
--- a/gallerycommon/src/com/android/gallery3d/common/Utils.java
+++ b/gallerycommon/src/com/android/gallery3d/common/Utils.java
@@ -310,7 +310,7 @@ public class Utils {
Build.DEVICE,
Build.MODEL,
Build.ID,
- Build.VERSION.SDK,
+ Build.VERSION.SDK_INT,
Build.VERSION.RELEASE,
Build.VERSION.INCREMENTAL);
}