summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherAppState.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-11-11 12:23:59 -0800
committerSunny Goyal <sunnygoyal@google.com>2014-11-11 12:24:13 -0800
commit4bbf419bf98c00decc74b429320258c2a16faeec (patch)
tree23fa6a2be16c9cba519ad830712824492839ae08 /src/com/android/launcher3/LauncherAppState.java
parent8dfe2da6985d38f23fd3426101574c093f509907 (diff)
downloadandroid_packages_apps_Trebuchet-4bbf419bf98c00decc74b429320258c2a16faeec.tar.gz
android_packages_apps_Trebuchet-4bbf419bf98c00decc74b429320258c2a16faeec.tar.bz2
android_packages_apps_Trebuchet-4bbf419bf98c00decc74b429320258c2a16faeec.zip
Removing some duplicate methods
Change-Id: I8a1295ab74890984e8d8508aaa18fd79ac2a032d
Diffstat (limited to 'src/com/android/launcher3/LauncherAppState.java')
-rw-r--r--src/com/android/launcher3/LauncherAppState.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 48af216bb..e5fa03208 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.Configuration;
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 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
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 class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
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() {