diff options
Diffstat (limited to 'src/com/android/launcher3/compat/LauncherAppsCompatVL.java')
-rw-r--r-- | src/com/android/launcher3/compat/LauncherAppsCompatVL.java | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java index f408da0aa..60f9fabf0 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java @@ -16,7 +16,6 @@ package com.android.launcher3.compat; -import android.annotation.TargetApi; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -24,7 +23,6 @@ import android.content.pm.LauncherActivityInfo; import android.content.pm.LauncherApps; import android.content.pm.ShortcutInfo; import android.graphics.Rect; -import android.os.Build; import android.os.Bundle; import android.os.UserHandle; @@ -36,32 +34,30 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -@TargetApi(Build.VERSION_CODES.LOLLIPOP) -public class LauncherAppsCompatVL extends LauncherAppsCompatV16 { +public class LauncherAppsCompatVL extends LauncherAppsCompat { protected LauncherApps mLauncherApps; - private Map<OnAppsChangedCallbackCompat, WrappedCallback> mCallbacks - = new HashMap<OnAppsChangedCallbackCompat, WrappedCallback>(); + private Map<OnAppsChangedCallbackCompat, WrappedCallback> mCallbacks = new HashMap<>(); LauncherAppsCompatVL(Context context) { - super(context); - mLauncherApps = (LauncherApps) context.getSystemService("launcherapps"); + mLauncherApps = (LauncherApps) context.getSystemService(Context.LAUNCHER_APPS_SERVICE); } + @Override public List<LauncherActivityInfoCompat> getActivityList(String packageName, UserHandle user) { List<LauncherActivityInfo> list = mLauncherApps.getActivityList(packageName, user); if (list.size() == 0) { return Collections.emptyList(); } - ArrayList<LauncherActivityInfoCompat> compatList = - new ArrayList<LauncherActivityInfoCompat>(list.size()); + ArrayList<LauncherActivityInfoCompat> compatList = new ArrayList<>(list.size()); for (LauncherActivityInfo info : list) { compatList.add(new LauncherActivityInfoCompatVL(info)); } return compatList; } + @Override public LauncherActivityInfoCompat resolveActivity(Intent intent, UserHandle user) { LauncherActivityInfo activity = mLauncherApps.resolveActivity(intent, user); if (activity != null) { @@ -71,15 +67,18 @@ public class LauncherAppsCompatVL extends LauncherAppsCompatV16 { } } + @Override public void startActivityForProfile(ComponentName component, UserHandle user, Rect sourceBounds, Bundle opts) { mLauncherApps.startMainActivity(component, user, sourceBounds, opts); } + @Override public void showAppDetailsForProfile(ComponentName component, UserHandle user) { mLauncherApps.startAppDetailsActivity(component, user, null, null); } + @Override public void addOnAppsChangedCallback(LauncherAppsCompat.OnAppsChangedCallbackCompat callback) { WrappedCallback wrappedCallback = new WrappedCallback(callback); synchronized (mCallbacks) { @@ -88,9 +87,9 @@ public class LauncherAppsCompatVL extends LauncherAppsCompatV16 { mLauncherApps.registerCallback(wrappedCallback); } - public void removeOnAppsChangedCallback( - LauncherAppsCompat.OnAppsChangedCallbackCompat callback) { - WrappedCallback wrappedCallback = null; + @Override + public void removeOnAppsChangedCallback(OnAppsChangedCallbackCompat callback) { + final WrappedCallback wrappedCallback; synchronized (mCallbacks) { wrappedCallback = mCallbacks.remove(callback); } @@ -99,18 +98,16 @@ public class LauncherAppsCompatVL extends LauncherAppsCompatV16 { } } + @Override public boolean isPackageEnabledForProfile(String packageName, UserHandle user) { return mLauncherApps.isPackageEnabled(packageName, user); } + @Override public boolean isActivityEnabledForProfile(ComponentName component, UserHandle user) { return mLauncherApps.isActivityEnabled(component, user); } - public boolean isPackageSuspendedForProfile(String packageName, UserHandle user) { - return false; - } - private static class WrappedCallback extends LauncherApps.Callback { private LauncherAppsCompat.OnAppsChangedCallbackCompat mCallback; @@ -147,7 +144,6 @@ public class LauncherAppsCompatVL extends LauncherAppsCompatV16 { mCallback.onPackagesUnsuspended(packageNames, user); } - @Override public void onShortcutsChanged(String packageName, List<ShortcutInfo> shortcuts, UserHandle user) { List<ShortcutInfoCompat> shortcutInfoCompats = new ArrayList<>(shortcuts.size()); |