diff options
| author | 2022-03-30 18:30:56 -0700 | |
|---|---|---|
| committer | 2022-04-01 23:10:43 +0000 | |
| commit | dde19ea64d4b6a737ce930ef5f10cb49c6e18ded (patch) | |
| tree | cbe94d64f5254a89cf4801fdc810e5478d23e240 | |
| parent | ee09cd03f38b42f6d27ab4a35af763f944835e89 (diff) | |
Rename "ONE_SEARCH" attributes to "WEB_SEARCH"
* Minor fix to logging
Bug: 210792253
Test: manual
Change-Id: Ib32b945e1fa7696b3b8360dae01e1bd00295ff8d
| -rw-r--r-- | protos/launcher_atom.proto | 13 | ||||
| -rw-r--r-- | quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto index a61e430d37..41276507ab 100644 --- a/protos/launcher_atom.proto +++ b/protos/launcher_atom.proto @@ -121,6 +121,7 @@ message TaskBarContainer { optional int32 cardinality = 2; } +// Next value 39 enum Attribute { UNKNOWN = 0; DEFAULT_LAYOUT = 1; // icon automatically placed in workspace, folder, hotseat @@ -166,11 +167,13 @@ enum Attribute { ALL_APPS_SEARCH_RESULT_ASSISTANT_MEMORY = 31; // Suggestion Type provided by AGA - ONE_SEARCH_WEB_QUERY = 32; - ONE_SEARCH_WEB_TRENDING = 33; - ONE_SEARCH_WEB_ENTITY = 34; - ONE_SEARCH_WEB_ANSWER = 35; - ONE_SEARCH_WEB_PERSONAL = 36; + WEB_SEARCH_RESULT_QUERY = 32; + WEB_SEARCH_RESULT_TRENDING = 33; + WEB_SEARCH_RESULT_ENTITY = 34; + WEB_SEARCH_RESULT_ANSWER = 35; + WEB_SEARCH_RESULT_PERSONAL = 36; + WEB_SEARCH_RESULT_CALCULATOR = 37; + WEB_SEARCH_RESULT_URL = 38; WIDGETS_BOTTOM_TRAY = 28; WIDGETS_TRAY_PREDICTION = 29; diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index f6002ec10a..13007ea512 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -403,7 +403,7 @@ public class StatsLogCompatManager extends StatsLogManager { String.format("(State:%s->%s)", getStateString(srcState), getStateString(dstState))); } - if (mItemInfo != DEFAULT_ITEM_INFO) { + if (atomInfo.hasContainerInfo()) { logStringBuilder.append("\n").append(atomInfo); } Log.d(TAG, logStringBuilder.toString()); @@ -492,9 +492,7 @@ public class StatsLogCompatManager extends StatsLogManager { String name = (event instanceof Enum) ? ((Enum) event).name() : event.getId() + ""; StringBuilder logStringBuilder = new StringBuilder("\n"); - if (mInstanceId != DEFAULT_INSTANCE_ID) { - logStringBuilder.append(String.format("InstanceId:%s ", mInstanceId)); - } + logStringBuilder.append(String.format("InstanceId:%s ", mInstanceId)); logStringBuilder.append(String.format("%s=%sms", name, mLatencyInMillis)); Log.d(LATENCY_TAG, logStringBuilder.toString()); } |