diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-06-17 08:43:56 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-06-17 08:44:51 -0700 |
commit | ae50284e0a838139c67caf0064a0977c871497fa (patch) | |
tree | 45147a676bc32b604a9c64808a3a836de748e3a4 /src/com/android/launcher3/LauncherAppState.java | |
parent | bb011dad4e69bec027be1e00d573a3095b318b43 (diff) | |
download | android_packages_apps_Trebuchet-ae50284e0a838139c67caf0064a0977c871497fa.tar.gz android_packages_apps_Trebuchet-ae50284e0a838139c67caf0064a0977c871497fa.tar.bz2 android_packages_apps_Trebuchet-ae50284e0a838139c67caf0064a0977c871497fa.zip |
Moving LauncherAccessibilityDelegate to Launcher to associate it with
activity lifecycle.
Change-Id: Ib815505677fa7ed74bdcfe7141b1d9bea5d7143a
Diffstat (limited to 'src/com/android/launcher3/LauncherAppState.java')
-rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index ae3abbf61..c2e7f1aac 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -16,20 +16,18 @@ package com.android.launcher3; -import android.app.SearchManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.util.Log; -import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.PackageInstallerCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.dynamicui.ExtractionUtils; -import com.android.launcher3.util.ConfigMonitor; import com.android.launcher3.logging.FileLog; +import com.android.launcher3.util.ConfigMonitor; import com.android.launcher3.util.TestingUtils; import com.android.launcher3.util.Thunk; @@ -51,8 +49,6 @@ public class LauncherAppState { private InvariantDeviceProfile mInvariantDeviceProfile; - private LauncherAccessibilityDelegate mAccessibilityDelegate; - public static LauncherAppState getInstance() { if (INSTANCE == null) { INSTANCE = new LauncherAppState(); @@ -154,15 +150,9 @@ public class LauncherAppState { LauncherModel setLauncher(Launcher launcher) { sLauncherProvider.get().setLauncherProviderChangeListener(launcher); mModel.initialize(launcher); - mAccessibilityDelegate = ((launcher != null) && Utilities.ATLEAST_LOLLIPOP) ? - new LauncherAccessibilityDelegate(launcher) : null; return mModel; } - public LauncherAccessibilityDelegate getAccessibilityDelegate() { - return mAccessibilityDelegate; - } - public IconCache getIconCache() { return mIconCache; } |