Merge "Not using SIDELOADED_LAUNCHER name" into ub-launcher3-master

protos/launcher_log.proto

@@ -93,7 +93,7 @@ enum ContainerType {
   TASKSWITCHER = 12; // Recents UI Container (QuickStep)
   APP = 13; // Foreground activity is another app (QuickStep)
   TIP = 14; // Onboarding texts (QuickStep)
-  SIDELOADED_LAUNCHER = 15;
+  OTHER_LAUNCHER_APP = 15;
 }
 
 // Used to define what type of control a Target would represent.

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java

@@ -226,7 +226,7 @@ public final class FallbackActivityInterface implements
         RecentsActivity activity = getCreatedActivity();
         boolean visible = activity != null && activity.isStarted() && activity.hasWindowFocus();
         return visible
-                ? LauncherLogProto.ContainerType.SIDELOADED_LAUNCHER
+                ? LauncherLogProto.ContainerType.OTHER_LAUNCHER_APP
                 : LauncherLogProto.ContainerType.APP;
     }