From 0a117d8fca8fa83aee85cbe9c7df81105c8ff62e Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Mon, 3 May 2021 15:23:46 +0800 Subject: [PATCH] Refine dump info of One Handed Mode components 1) "ComponentName" + "States:" Sometimes confuse developers (e.g: OneHandedControllerStates) 2) The indent of OneHandedSettingsUtil is incorrect Test: adb shell dumpsys activity service com.android.systemui Test: make Bug: 187014022 Change-Id: Icca01221986efdf9a1f9975efa30e485c5be36b0 --- .../wm/shell/onehanded/OneHandedAccessibilityUtil.java | 2 +- .../wm/shell/onehanded/OneHandedBackgroundPanelOrganizer.java | 2 +- .../com/android/wm/shell/onehanded/OneHandedController.java | 3 ++- .../wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java | 2 +- .../android/wm/shell/onehanded/OneHandedGestureHandler.java | 2 +- .../com/android/wm/shell/onehanded/OneHandedSettingsUtil.java | 4 ++-- .../src/com/android/wm/shell/onehanded/OneHandedState.java | 2 +- .../android/wm/shell/onehanded/OneHandedTimeoutHandler.java | 4 +--- .../com/android/wm/shell/onehanded/OneHandedTouchHandler.java | 2 +- .../android/wm/shell/onehanded/OneHandedTutorialHandler.java | 2 +- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedAccessibilityUtil.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedAccessibilityUtil.java index 130246177fdca..4892e6b1b30f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedAccessibilityUtil.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedAccessibilityUtil.java @@ -82,7 +82,7 @@ public final class OneHandedAccessibilityUtil { public void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "States: "); + pw.println(TAG); pw.print(innerPrefix + "mPackageName="); pw.println(mPackageName); pw.print(innerPrefix + "mDescription="); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedBackgroundPanelOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedBackgroundPanelOrganizer.java index 703eba9d6af7a..481b948173850 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedBackgroundPanelOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedBackgroundPanelOrganizer.java @@ -203,7 +203,7 @@ public class OneHandedBackgroundPanelOrganizer extends DisplayAreaOrganizer void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "states: "); + pw.println(TAG); pw.print(innerPrefix + "mIsShowing="); pw.println(mIsShowing); pw.print(innerPrefix + "mBkgBounds="); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java index 04ec3917428e4..ae7ab528ed0af 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java @@ -630,7 +630,8 @@ public class OneHandedController implements RemoteCallable public void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "States: "); + pw.println(); + pw.println(TAG); pw.print(innerPrefix + "mOffSetFraction="); pw.println(mOffSetFraction); pw.print(innerPrefix + "mLockedDisabled="); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java index 4b4d934bef438..7844c1161c0f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java @@ -323,7 +323,7 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "states: "); + pw.println(TAG); pw.print(innerPrefix + "mDisplayLayout.rotation()="); pw.println(mDisplayLayout.rotation()); pw.print(innerPrefix + "mDisplayAreaTokenMap="); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java index 9e83a61667b2a..03832294aaca2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java @@ -276,7 +276,7 @@ public class OneHandedGestureHandler implements OneHandedTransitionCallback { void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "States: "); + pw.println(TAG); pw.print(innerPrefix + "mAllowGesture="); pw.println(mAllowGesture); pw.print(innerPrefix + "mIsEnabled="); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java index 1b2fcdd6313e6..2ab51f3f1313e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedSettingsUtil.java @@ -137,8 +137,8 @@ public final class OneHandedSettingsUtil { void dump(PrintWriter pw, String prefix, ContentResolver resolver, int userId) { - final String innerPrefix = prefix + " "; - pw.println(innerPrefix + TAG); + final String innerPrefix = " "; + pw.println(TAG); pw.print(innerPrefix + "isOneHandedModeEnable="); pw.println(getSettingsOneHandedModeEnabled(resolver, userId)); pw.print(innerPrefix + "oneHandedTimeOut="); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedState.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedState.java index cc874432be876..facc4bd2b6e8b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedState.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedState.java @@ -90,7 +90,7 @@ public class OneHandedState { /** Dumps internal state. */ public void dump(PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "states: "); + pw.println(TAG); pw.println(innerPrefix + "sCurrentState=" + sCurrentState); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTimeoutHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTimeoutHandler.java index 4a98941b7410c..899c9ae748d01 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTimeoutHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTimeoutHandler.java @@ -18,8 +18,6 @@ package com.android.wm.shell.onehanded; import static com.android.wm.shell.onehanded.OneHandedSettingsUtil.ONE_HANDED_TIMEOUT_MEDIUM_IN_SECONDS; -import android.os.Handler; - import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; @@ -122,7 +120,7 @@ public class OneHandedTimeoutHandler { void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "states: "); + pw.println(TAG); pw.print(innerPrefix + "sTimeout="); pw.println(mTimeout); pw.print(innerPrefix + "sListeners="); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTouchHandler.java index c7a49ff01d15f..0f9b320791b96 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTouchHandler.java @@ -156,7 +156,7 @@ public class OneHandedTouchHandler implements OneHandedTransitionCallback { void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + "states: "); + pw.println(TAG); pw.print(innerPrefix + "mLastUpdatedBounds="); pw.println(mLastUpdatedBounds); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTutorialHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTutorialHandler.java index 7a3f34d0e5a59..d55359ccbe156 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTutorialHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTutorialHandler.java @@ -219,7 +219,7 @@ public class OneHandedTutorialHandler implements OneHandedTransitionCallback { void dump(@NonNull PrintWriter pw) { final String innerPrefix = " "; - pw.println(TAG + " states: "); + pw.println(TAG); pw.print(innerPrefix + "mTriggerState="); pw.println(mTriggerState); pw.print(innerPrefix + "mDisplayBounds=");