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

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

Merge "Remove ResultType.NAVVYSITE and resuse it for SESSION_INFO." into udc-dev am: d97c0260 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/22359801



Change-Id: Icb9608370b96fd33ed254b854980798e2d5fed09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c0998d1 d97c0260

searchuilib/src/com/android/app/search/ResultType.java

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public class ResultType { 
    public static final int SUGGEST = 1 << 9;

    public static final int ASSISTANT = 1 << 10;

    public static final int CHROMETAB = 1 << 11;

    public static final int NAVVYSITE = 1 << 12;

    public static final int SESSION_INFO = 1 << 12;

    public static final int TIPS = 1 << 13;

    public static final int PEOPLE_TILE = 1 << 14;

    public static final int LEGACY_SHORTCUT = 1 << 15;
@@ -56,7 +56,7 @@ public class ResultType { 
    public static final int PRIMITIVE_TYPE = APPLICATION | SLICE | SHORTCUT | WIDGETS | ACTION |

            LEGACY_SHORTCUT;

    public static final int CORPUS_TYPE =

            PEOPLE | SETTING | IMAGE | PLAY | SUGGEST | ASSISTANT | CHROMETAB | NAVVYSITE | TIPS

            PEOPLE | SETTING | IMAGE | PLAY | SUGGEST | ASSISTANT | CHROMETAB | TIPS

                    | PEOPLE_TILE | MEMORY | WEB_SUGGEST | VIDEO;

    public static final int RANK_TYPE = SYSTEM_POINTER;

    public static final int UI_TYPE = EDUCARD | NO_FULFILLMENT;