Good riddance UserEventDispatcher
Bug: 165675920 Bug: 161381246 TL;DR;; - nano -> lite proto - add all the missing logs to WW - pin item related logging fix - Removed logging for assistant sgrep "com.android.launcher3.userevent.nano." | cut -f1 -d: | xargs sed -i -e 's/userevent\.nano\./userevent\./g' Change-Id: Ie2a49fdd891cacbd7ef40a1dc9e41ff0574c7517
This commit is contained in:
Hyunyoung Song
@@ -20,15 +20,9 @@ import static android.text.TextUtils.isEmpty;
|
||||
|
||||
import static androidx.core.util.Preconditions.checkNotNull;
|
||||
|
||||
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
|
||||
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
|
||||
import static com.android.launcher3.logger.LauncherAtom.Attribute.EMPTY_LABEL;
|
||||
import static com.android.launcher3.logger.LauncherAtom.Attribute.MANUAL_LABEL;
|
||||
import static com.android.launcher3.logger.LauncherAtom.Attribute.SUGGESTED_LABEL;
|
||||
import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_CUSTOM;
|
||||
import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_EMPTY;
|
||||
import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
|
||||
import static com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState.FROM_SUGGESTED;
|
||||
|
||||
import android.os.Process;
|
||||
|
||||
@@ -43,10 +37,6 @@ import com.android.launcher3.logger.LauncherAtom.Attribute;
|
||||
import com.android.launcher3.logger.LauncherAtom.FromState;
|
||||
import com.android.launcher3.logger.LauncherAtom.ToState;
|
||||
import com.android.launcher3.model.ModelWriter;
|
||||
import com.android.launcher3.userevent.LauncherLogProto;
|
||||
import com.android.launcher3.userevent.LauncherLogProto.Target;
|
||||
import com.android.launcher3.userevent.LauncherLogProto.Target.FromFolderLabelState;
|
||||
import com.android.launcher3.userevent.LauncherLogProto.Target.ToFolderLabelState;
|
||||
import com.android.launcher3.util.ContentWriter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -359,113 +349,4 @@ public class FolderInfo extends ItemInfo {
|
||||
}
|
||||
return LauncherAtom.ToState.TO_STATE_UNSPECIFIED;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns {@link LauncherLogProto.LauncherEvent} to log current folder label info.
|
||||
*
|
||||
* @deprecated This method is used only for validation purpose and soon will be removed.
|
||||
*/
|
||||
@Deprecated
|
||||
public LauncherLogProto.LauncherEvent getFolderLabelStateLauncherEvent(FromState fromState,
|
||||
ToState toState) {
|
||||
return LauncherLogProto.LauncherEvent.newBuilder()
|
||||
.setAction(LauncherLogProto.Action
|
||||
.newBuilder()
|
||||
.setType(LauncherLogProto.Action.Type.SOFT_KEYBOARD))
|
||||
.addSrcTarget(Target
|
||||
.newBuilder()
|
||||
.setType(Target.Type.ITEM)
|
||||
.setItemType(LauncherLogProto.ItemType.EDITTEXT)
|
||||
.setFromFolderLabelState(convertFolderLabelState(fromState))
|
||||
.setToFolderLabelState(convertFolderLabelState(toState)))
|
||||
.addSrcTarget(Target.newBuilder()
|
||||
.setType(Target.Type.CONTAINER)
|
||||
.setContainerType(LauncherLogProto.ContainerType.FOLDER)
|
||||
.setPageIndex(screenId)
|
||||
.setGridX(cellX)
|
||||
.setGridY(cellY)
|
||||
.setCardinality(contents.size()))
|
||||
.addSrcTarget(newParentContainerTarget())
|
||||
.build();
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This method is used only for validation purpose and soon will be removed.
|
||||
*/
|
||||
@Deprecated
|
||||
private Target.Builder newParentContainerTarget() {
|
||||
Target.Builder builder = Target.newBuilder().setType(Target.Type.CONTAINER);
|
||||
switch (container) {
|
||||
case CONTAINER_HOTSEAT:
|
||||
return builder.setContainerType(LauncherLogProto.ContainerType.HOTSEAT);
|
||||
case CONTAINER_DESKTOP:
|
||||
return builder.setContainerType(LauncherLogProto.ContainerType.WORKSPACE);
|
||||
default:
|
||||
throw new AssertionError(String
|
||||
.format("Expected container to be either %s or %s but found %s.",
|
||||
CONTAINER_HOTSEAT,
|
||||
CONTAINER_DESKTOP,
|
||||
container));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This method is used only for validation purpose and soon will be removed.
|
||||
*/
|
||||
@Deprecated
|
||||
private static FromFolderLabelState convertFolderLabelState(FromState fromState) {
|
||||
switch (fromState) {
|
||||
case FROM_EMPTY:
|
||||
return FROM_EMPTY;
|
||||
case FROM_SUGGESTED:
|
||||
return FROM_SUGGESTED;
|
||||
case FROM_CUSTOM:
|
||||
return FROM_CUSTOM;
|
||||
default:
|
||||
return FROM_FOLDER_LABEL_STATE_UNSPECIFIED;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This method is used only for validation purpose and soon will be removed.
|
||||
*/
|
||||
@Deprecated
|
||||
private static ToFolderLabelState convertFolderLabelState(ToState toState) {
|
||||
switch (toState) {
|
||||
case UNCHANGED:
|
||||
return ToFolderLabelState.UNCHANGED;
|
||||
case TO_SUGGESTION0:
|
||||
return ToFolderLabelState.TO_SUGGESTION0_WITH_VALID_PRIMARY;
|
||||
case TO_SUGGESTION1_WITH_VALID_PRIMARY:
|
||||
return ToFolderLabelState.TO_SUGGESTION1_WITH_VALID_PRIMARY;
|
||||
case TO_SUGGESTION1_WITH_EMPTY_PRIMARY:
|
||||
return ToFolderLabelState.TO_SUGGESTION1_WITH_EMPTY_PRIMARY;
|
||||
case TO_SUGGESTION2_WITH_VALID_PRIMARY:
|
||||
return ToFolderLabelState.TO_SUGGESTION2_WITH_VALID_PRIMARY;
|
||||
case TO_SUGGESTION2_WITH_EMPTY_PRIMARY:
|
||||
return ToFolderLabelState.TO_SUGGESTION2_WITH_EMPTY_PRIMARY;
|
||||
case TO_SUGGESTION3_WITH_VALID_PRIMARY:
|
||||
return ToFolderLabelState.TO_SUGGESTION3_WITH_VALID_PRIMARY;
|
||||
case TO_SUGGESTION3_WITH_EMPTY_PRIMARY:
|
||||
return ToFolderLabelState.TO_SUGGESTION3_WITH_EMPTY_PRIMARY;
|
||||
case TO_EMPTY_WITH_VALID_PRIMARY:
|
||||
return ToFolderLabelState.TO_EMPTY_WITH_VALID_PRIMARY;
|
||||
case TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
|
||||
return ToFolderLabelState.TO_EMPTY_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
|
||||
case TO_EMPTY_WITH_EMPTY_SUGGESTIONS:
|
||||
return ToFolderLabelState.TO_EMPTY_WITH_EMPTY_SUGGESTIONS;
|
||||
case TO_EMPTY_WITH_SUGGESTIONS_DISABLED:
|
||||
return ToFolderLabelState.TO_EMPTY_WITH_SUGGESTIONS_DISABLED;
|
||||
case TO_CUSTOM_WITH_VALID_PRIMARY:
|
||||
return ToFolderLabelState.TO_CUSTOM_WITH_VALID_PRIMARY;
|
||||
case TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY:
|
||||
return ToFolderLabelState.TO_CUSTOM_WITH_VALID_SUGGESTIONS_AND_EMPTY_PRIMARY;
|
||||
case TO_CUSTOM_WITH_EMPTY_SUGGESTIONS:
|
||||
return ToFolderLabelState.TO_CUSTOM_WITH_EMPTY_SUGGESTIONS;
|
||||
case TO_CUSTOM_WITH_SUGGESTIONS_DISABLED:
|
||||
return ToFolderLabelState.TO_CUSTOM_WITH_SUGGESTIONS_DISABLED;
|
||||
default:
|
||||
return ToFolderLabelState.TO_FOLDER_LABEL_STATE_UNSPECIFIED;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user