From bd28a8ec0c46bf9b0ebf87520e69faa40295fc2a Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 13 Dec 2019 17:16:19 -0800 Subject: [PATCH] Not using SIDELOADED_LAUNCHER name It may imply something malicious, while we simply mean a third-party launcher. Bug: 79437767 Change-Id: I2e169fda9404ca7a042e40877ed6f4b7d2d723a1 --- protos/launcher_log.proto | 2 +- .../src/com/android/quickstep/FallbackActivityInterface.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto index 055ade58eb..ea12016a59 100644 --- a/protos/launcher_log.proto +++ b/protos/launcher_log.proto @@ -92,7 +92,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. diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java index f889bc1c1c..6574d22217 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java +++ b/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; }