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

Commit 3fc6e4c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update LauncherState toString()" into ub-launcher3-rvc-dev

parents 5a763db3 f844ee9f

src/com/android/launcher3/LauncherState.java

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.launcher3.statemanager.BaseState; 
import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.states.HintState;

import com.android.launcher3.states.SpringLoadedState;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.uioverrides.states.AllAppsState;

import com.android.launcher3.uioverrides.states.OverviewState;

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
@@ -260,7 +261,7 @@ public abstract class LauncherState implements BaseState<LauncherState> { 


    @Override

    public String toString() {

        return "Ordinal-" + ordinal;

        return TestProtocol.stateOrdinalToString(ordinal);

    }



    public void onBackPressed(Launcher launcher) {

src/com/android/launcher3/testing/TestProtocol.java

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public final class TestProtocol { 
            case OVERVIEW_PEEK_STATE_ORDINAL:

                return "OverviewPeek";

            case OVERVIEW_MODAL_TASK_STATE_ORDINAL:

                return "OverviewModalState";

                return "OverviewModal";

            case QUICK_SWITCH_STATE_ORDINAL:

                return "QuickSwitch";

            case ALL_APPS_STATE_ORDINAL:
@@ -59,7 +59,7 @@ public final class TestProtocol { 
            case HINT_STATE_ORDINAL:

                return "Hint";

            default:

                return null;

                return "Unknown";

        }

    }