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

Commit a943df38 authored by Anushree Ganjam's avatar Anushree Ganjam Committed by Automerger Merge Worker
Browse files

Merge "Creating enum alias ALL_APPS_SEARCH_RESULT_FALLBACK for... 

Merge "Creating enum alias ALL_APPS_SEARCH_RESULT_FALLBACK for ALL_APPS_SEARCH_RESULT_SUGGEST." into tm-qpr-dev am: c01068f4

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



Change-Id: Idfe2d166e0bfc73db8e33a9e9dc35b736941d0a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 673549f1 c01068f4

protos/launcher_atom.proto

+4 −1
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ message TaskBarContainer { 


// Next value 44

enum Attribute {

  option allow_alias = true;



  UNKNOWN = 0;

  DEFAULT_LAYOUT = 1;       // icon automatically placed in workspace, folder, hotseat

  BACKUP_RESTORE = 2;       // icon layout restored from backup
@@ -166,7 +168,8 @@ enum Attribute { 
  ALL_APPS_SEARCH_RESULT_SLICE = 19;

  ALL_APPS_SEARCH_RESULT_WIDGETS = 20;

  ALL_APPS_SEARCH_RESULT_PLAY = 21;

  ALL_APPS_SEARCH_RESULT_SUGGEST = 22;

  ALL_APPS_SEARCH_RESULT_FALLBACK = 22;

  ALL_APPS_SEARCH_RESULT_SUGGEST = 22 [deprecated = true];

  ALL_APPS_SEARCH_RESULT_ASSISTANT = 23;

  ALL_APPS_SEARCH_RESULT_CHROMETAB = 24;

  ALL_APPS_SEARCH_RESULT_NAVVYSITE = 25;