diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7abdef866b..bed4fa958b 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -209,7 +209,7 @@ import com.android.launcher3.widget.WidgetManagerHelper; import com.android.launcher3.widget.custom.CustomWidgetManager; import com.android.launcher3.widget.model.WidgetsListBaseEntry; import com.android.launcher3.widget.picker.WidgetsFullSheet; -import com.android.systemui.plugins.OverlayPlugin; +import com.android.systemui.plugins.LauncherOverlayPlugin; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.shared.LauncherExterns; import com.android.systemui.plugins.shared.LauncherOverlayManager; @@ -232,8 +232,8 @@ import java.util.stream.Stream; * Default launcher application. */ public class Launcher extends StatefulActivity implements LauncherExterns, - Callbacks, InvariantDeviceProfile.OnIDPChangeListener, PluginListener, - LauncherOverlayCallbacks { + Callbacks, InvariantDeviceProfile.OnIDPChangeListener, + PluginListener, LauncherOverlayCallbacks { public static final String TAG = "Launcher"; public static final ActivityTracker ACTIVITY_TRACKER = new ActivityTracker<>(); @@ -534,7 +534,7 @@ public class Launcher extends StatefulActivity implements Launche } mOverlayManager = getDefaultOverlay(); PluginManagerWrapper.INSTANCE.get(this).addPluginListener(this, - OverlayPlugin.class, false /* allowedMultiple */); + LauncherOverlayPlugin.class, false /* allowedMultiple */); mRotationHelper.initialize(); TraceHelper.INSTANCE.endSection(traceToken); @@ -560,12 +560,12 @@ public class Launcher extends StatefulActivity implements Launche } @Override - public void onPluginConnected(OverlayPlugin overlayManager, Context context) { + public void onPluginConnected(LauncherOverlayPlugin overlayManager, Context context) { switchOverlay(() -> overlayManager.createOverlayManager(this, this)); } @Override - public void onPluginDisconnected(OverlayPlugin plugin) { + public void onPluginDisconnected(LauncherOverlayPlugin plugin) { switchOverlay(this::getDefaultOverlay); } diff --git a/src_plugins/com/android/systemui/plugins/OverlayPlugin.java b/src_plugins/com/android/systemui/plugins/LauncherOverlayPlugin.java similarity index 88% rename from src_plugins/com/android/systemui/plugins/OverlayPlugin.java rename to src_plugins/com/android/systemui/plugins/LauncherOverlayPlugin.java index 1edb69273f..9e223556bc 100644 --- a/src_plugins/com/android/systemui/plugins/OverlayPlugin.java +++ b/src_plugins/com/android/systemui/plugins/LauncherOverlayPlugin.java @@ -24,8 +24,8 @@ import com.android.systemui.plugins.shared.LauncherOverlayManager; /** * Implement this interface to add a -1 content on the home screen. */ -@ProvidesInterface(action = OverlayPlugin.ACTION, version = OverlayPlugin.VERSION) -public interface OverlayPlugin extends Plugin { +@ProvidesInterface(action = LauncherOverlayPlugin.ACTION, version = LauncherOverlayPlugin.VERSION) +public interface LauncherOverlayPlugin extends Plugin { String ACTION = "com.android.systemui.action.PLUGIN_LAUNCHER_OVERLAY"; int VERSION = 1;