PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make AllAppsEntry and exit events optional." into tm-dev am: 8e432009d6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17126208

Change-Id: I4da5abf29393305cd10bf7e351b2ea2df9da0e29
This commit is contained in:
TreeHugger Robot
2022-03-09 23:52:51 +00:00
committed by Automerger Merge Worker
parent 0c3ea2ac19 8e432009d6
commit 00d3c41b66
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+19 -15
View File
@@ -228,6 +228,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -1108,21 +1109,23 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
&& mAllAppsSessionLogId == null) {
// creates new instance ID since new all apps session is started.
mAllAppsSessionLogId = new InstanceIdSequence().newInstanceId();
getStatsLogManager().logger().withContainerInfo(
ContainerInfo.newBuilder().setWorkspace(
WorkspaceContainer.newBuilder().setPageIndex(
getWorkspace().getCurrentPage())).build())
.log(getAllAppsEntryEvent());
if (getAllAppsEntryEvent().isPresent()) {
getStatsLogManager().logger()
.withContainerInfo(ContainerInfo.newBuilder()
.setWorkspace(WorkspaceContainer.newBuilder()
.setPageIndex(getWorkspace().getCurrentPage())).build())
.log(getAllAppsEntryEvent().get());
}
}
}
/**
* Returns {@link EventEnum} that should be logged when Launcher enters into AllApps state.
*/
protected EventEnum getAllAppsEntryEvent() {
return FeatureFlags.ENABLE_DEVICE_SEARCH.get()
protected Optional<EventEnum> getAllAppsEntryEvent() {
return Optional.of(FeatureFlags.ENABLE_DEVICE_SEARCH.get()
? LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH
: LAUNCHER_ALLAPPS_ENTRY;
: LAUNCHER_ALLAPPS_ENTRY);
}
@Override
@@ -1151,17 +1154,18 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
// Making sure mAllAppsSessionLogId is not null to avoid double logging.
&& mAllAppsSessionLogId != null) {
getAppsView().reset(false);
getStatsLogManager().logger()
.withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()
.setWorkspace(
LauncherAtom.WorkspaceContainer.newBuilder()
.setPageIndex(getWorkspace().getCurrentPage()))
.build())
.log(LAUNCHER_ALLAPPS_EXIT);
getAllAppsExitEvent().ifPresent(getStatsLogManager().logger()::log);
mAllAppsSessionLogId = null;
}
}
/**
* Returns {@link EventEnum} that should be logged when Launcher exists from AllApps state.
*/
protected Optional<EventEnum> getAllAppsExitEvent() {
return Optional.of(LAUNCHER_ALLAPPS_EXIT);
}
@Override
protected void onResume() {
Object traceToken = TraceHelper.INSTANCE.beginSection(ON_RESUME_EVT,