Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b266baa6 authored by Thiru Ramasamy's avatar Thiru Ramasamy Committed by Android (Google) Code Review
Browse files

Merge "Rename "ONE_SEARCH" attributes to "WEB_SEARCH"" into tm-dev

parents d5d06190 dde19ea6

protos/launcher_atom.proto

+8 −5
Original line number Diff line number Diff line
@@ -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;

quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java

+2 −4
Original line number Diff line number Diff line
@@ -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("%s=%sms", name, mLatencyInMillis));

                Log.d(LATENCY_TAG, logStringBuilder.toString());

            }