commit 4bbf419bf98c00decc74b429320258c2a16faeec
author Sunny Goyal <sunnygoyal@google.com> Tue Nov 11 12:23:59 2014 -0800
committer Sunny Goyal <sunnygoyal@google.com> Tue Nov 11 12:24:13 2014 -0800
tree 23fa6a2be16c9cba519ad830712824492839ae08
parent 8dfe2da6985d38f23fd3426101574c093f509907

Removing some duplicate methods

Change-Id: I8a1295ab74890984e8d8508aaa18fd79ac2a032d

src/com/android/launcher3/LauncherAppState.java

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 48af216..e5fa032 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -16,6 +16,7 @@
 
 package com.android.launcher3;
 
+import android.annotation.TargetApi;
 import android.app.SearchManager;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -26,16 +27,15 @@
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Point;
+import android.os.Build;
 import android.os.Handler;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
-
 import com.android.launcher3.compat.LauncherAppsCompat;
 import com.android.launcher3.compat.PackageInstallerCompat;
 import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo;
-
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
@@ -194,6 +194,7 @@
         return LauncherFiles.SHARED_PREFERENCES_KEY;
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     DeviceProfile initDynamicGrid(Context context) {
         // Determine the dynamic grid properties
         WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
@@ -269,7 +270,7 @@
     public static boolean isDisableAllApps() {
         // Returns false on non-dogfood builds.
         return getInstance().mBuildInfo.isDogfoodBuild() &&
-                Launcher.isPropertyEnabled(Launcher.DISABLE_ALL_APPS_PROPERTY);
+                Utilities.isPropertyEnabled(Launcher.DISABLE_ALL_APPS_PROPERTY);
     }
 
     public static boolean isDogfoodBuild() {