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

Commit 42a06b04 authored by Becky Qiu's avatar Becky Qiu Committed by Automerger Merge Worker
Browse files

[Omnient] Creates an AOSP AssistStateManager to dump in... 

[Omnient] Creates an AOSP AssistStateManager to dump in TouchInteractionService in AOSP. am: 86b6a887 am: f545328f

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



Change-Id: Ic62100a1f4ca6aa2a0a0c1a1962cedff070f7e70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9489d093 f545328f

quickstep/res/values/override.xml

+2 −0
Original line number Diff line number Diff line
@@ -33,4 +33,6 @@ 


  <string name="taskbar_model_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarModelCallbacksFactory</string>



  <string name="assist_state_manager_class" translatable="false"></string>



</resources>

quickstep/src/com/android/quickstep/TouchInteractionService.java

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ import com.android.quickstep.inputconsumers.TaskbarUnstashInputConsumer; 
import com.android.quickstep.inputconsumers.TrackpadStatusBarInputConsumer;

import com.android.quickstep.util.ActiveGestureLog;

import com.android.quickstep.util.ActiveGestureLog.CompoundString;

import com.android.quickstep.util.AssistStateManager;

import com.android.quickstep.util.AssistUtils;

import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -1352,6 +1353,8 @@ public class TouchInteractionService extends Service { 
            createdOverviewActivity.getDeviceProfile().dump(this, "", pw);

        }

        mTaskbarManager.dumpLogs("", pw);

        pw.println("AssistStateManager:");

        AssistStateManager.INSTANCE.get(this).dump("  ", pw);

    }



    private AbsSwipeUpHandler createLauncherSwipeHandler(

quickstep/src/com/android/quickstep/util/AssistStateManager.java

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.quickstep.util;



import static com.android.launcher3.util.MainThreadInitializedObject.forOverride;



import com.android.launcher3.R;

import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.launcher3.util.ResourceBasedOverride;



import java.io.PrintWriter;



/** Class to manage Assistant states. */

public class AssistStateManager implements ResourceBasedOverride {



    public static final MainThreadInitializedObject<AssistStateManager> INSTANCE =

            forOverride(AssistStateManager.class, R.string.assist_state_manager_class);



    public AssistStateManager() {}



    /** Whether search is available. */

    public boolean isSearchAvailable() {

        return false;

    }



    /** Dump states. */

    public void dump(String prefix, PrintWriter writer) {}

}