Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dump TaskbarDelegate info" into sc-v2-dev

Browse Source
This commit is contained in:
Winson Chung
2021-10-05 18:48:33 +00:00
committed by Android (Google) Code Review
parent 37001f99b9 3effcb4cd6
commit b62d71524a
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
View File

@@ -195,7 +195,8 @@ public class NavigationBarController implements
mNavigationModeController.addListener(this); mNavigationModeController.addListener(this);
mTaskbarDelegate = taskbarDelegate; mTaskbarDelegate = taskbarDelegate;
mTaskbarDelegate.setOverviewProxyService(commandQueue, overviewProxyService, mTaskbarDelegate.setOverviewProxyService(commandQueue, overviewProxyService,
navigationBarA11yHelper, navigationModeController, sysUiFlagsContainer); navigationBarA11yHelper, navigationModeController, sysUiFlagsContainer,
dumpManager);
mIsTablet = isTablet(mContext); mIsTablet = isTablet(mContext);
mUserTracker = userTracker; mUserTracker = userTracker;

22
packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
View File

@@ -46,8 +46,12 @@ import android.view.InsetsVisibilities;
import android.view.View; import android.view.View;
import android.view.WindowInsetsController.Behavior; import android.view.WindowInsetsController.Behavior;
import androidx.annotation.NonNull;
import com.android.internal.view.AppearanceRegion; import com.android.internal.view.AppearanceRegion;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.Dumpable;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.model.SysUiState; import com.android.systemui.model.SysUiState;
import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;
import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.recents.OverviewProxyService;
@@ -55,13 +59,16 @@ import com.android.systemui.shared.recents.utilities.Utilities;
import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@Singleton @Singleton
public class TaskbarDelegate implements CommandQueue.Callbacks, public class TaskbarDelegate implements CommandQueue.Callbacks,
OverviewProxyService.OverviewProxyListener, NavigationModeController.ModeChangedListener, OverviewProxyService.OverviewProxyListener, NavigationModeController.ModeChangedListener,
ComponentCallbacks { ComponentCallbacks, Dumpable {
private final EdgeBackGestureHandler mEdgeBackGestureHandler; private final EdgeBackGestureHandler mEdgeBackGestureHandler;
@@ -93,13 +100,14 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
OverviewProxyService overviewProxyService, OverviewProxyService overviewProxyService,
NavigationBarA11yHelper navigationBarA11yHelper, NavigationBarA11yHelper navigationBarA11yHelper,
NavigationModeController navigationModeController, NavigationModeController navigationModeController,
SysUiState sysUiState) { SysUiState sysUiState, DumpManager dumpManager) {
// TODO: adding this in the ctor results in a dagger dependency cycle :( // TODO: adding this in the ctor results in a dagger dependency cycle :(
mCommandQueue = commandQueue; mCommandQueue = commandQueue;
mOverviewProxyService = overviewProxyService; mOverviewProxyService = overviewProxyService;
mNavigationBarA11yHelper = navigationBarA11yHelper; mNavigationBarA11yHelper = navigationBarA11yHelper;
mNavigationModeController = navigationModeController; mNavigationModeController = navigationModeController;
mSysUiState = sysUiState; mSysUiState = sysUiState;
dumpManager.registerDumpable(this);
} }
public void destroy() { public void destroy() {
@@ -220,4 +228,14 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
@Override @Override
public void onLowMemory() {} public void onLowMemory() {}
@Override
public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {
pw.println("TaskbarDelegate (displayId=" + mDisplayId + "):");
pw.println(" mNavigationIconHints=" + mNavigationIconHints);
pw.println(" mDisabledFlags=" + mDisabledFlags);
pw.println(" mTaskBarWindowState=" + mTaskBarWindowState);
pw.println(" mBehavior=" + mBehavior);
mEdgeBackGestureHandler.dump(pw);
}
} }