From c510d4159600864ed17460429b478b0e3a02fd14 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 12 Jun 2018 13:08:23 -0700 Subject: [PATCH] Dump keyguard status bar state We didn't have KeyguardStatusBarView dumps in our dumpsys, adding more info will make our lives easier in the future. Test: adb shell dumpsys activity service com.android.systemui Change-Id: I07af14922501889cc15005f01463674f0651dfde Fixes: 109899206 --- .../graph/BatteryMeterDrawableBase.java | 4 ++++ .../src/com/android/systemui/BatteryMeterView.java | 13 +++++++++++++ .../statusbar/phone/KeyguardStatusBarView.java | 14 ++++++++++++++ .../statusbar/phone/NotificationPanelView.java | 10 ++++++++++ 4 files changed, 41 insertions(+) diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java index e609a40d1712c..17c2b02ed5766 100644 --- a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java @@ -210,6 +210,10 @@ public class BatteryMeterDrawableBase extends Drawable { postInvalidate(); } + public boolean getPowerSave() { + return mPowerSaveEnabled; + } + protected void setPowerSaveAsColorError(boolean asError) { mPowerSaveAsColorError = asError; } diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 7aef9fddedae3..61784fa9a64e4 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -56,6 +56,8 @@ import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService.Tunable; import com.android.systemui.util.Utils.DisableStateTracker; +import java.io.FileDescriptor; +import java.io.PrintWriter; import java.text.NumberFormat; public class BatteryMeterView extends LinearLayout implements @@ -343,6 +345,17 @@ public class BatteryMeterView extends LinearLayout implements return (int) ArgbEvaluator.getInstance().evaluate(darkIntensity, lightColor, darkColor); } + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + String powerSave = mDrawable == null ? null : mDrawable.getPowerSave() + ""; + CharSequence percent = mBatteryPercentView == null ? null : mBatteryPercentView.getText(); + pw.println(" BatteryMeterView:"); + pw.println(" mDrawable.getPowerSave: " + powerSave); + pw.println(" mBatteryPercentView.getText(): " + percent); + pw.println(" mTextColor: #" + Integer.toHexString(mTextColor)); + pw.println(" mLevel: " + mLevel); + pw.println(" mForceShowPercent: " + mForceShowPercent); + } + private final class SettingObserver extends ContentObserver { public SettingObserver(Handler handler) { super(handler); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index e096f3f39487e..e47dcea1006d4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -57,6 +57,9 @@ import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChange import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; +import java.io.FileDescriptor; +import java.io.PrintWriter; + /** * The header group on Keyguard. */ @@ -458,4 +461,15 @@ public class KeyguardStatusBarView extends RelativeLayout ((DarkReceiver) v).onDarkChanged(tintArea, intensity, color); } } + + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + pw.println("KeyguardStatusBarView:"); + pw.println(" mBatteryCharging: " + mBatteryCharging); + pw.println(" mKeyguardUserSwitcherShowing: " + mKeyguardUserSwitcherShowing); + pw.println(" mBatteryListening: " + mBatteryListening); + pw.println(" mLayoutState: " + mLayoutState); + if (mBatteryView != null) { + mBatteryView.dump(fd, pw, args); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 2f18aad9612de..3ad207ae265e0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -77,6 +77,8 @@ import com.android.systemui.statusbar.stack.AnimationProperties; import com.android.systemui.statusbar.stack.NotificationStackScrollLayout; import com.android.systemui.statusbar.stack.StackStateAnimator; +import java.io.FileDescriptor; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -2827,4 +2829,12 @@ public class NotificationPanelView extends PanelView implements setKeyguardStatusViewVisibility(mStatusBarState, true /* keyguardFadingAway */, false /* goingToFullShade */); } + + @Override + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + super.dump(fd, pw, args); + if (mKeyguardStatusBar != null) { + mKeyguardStatusBar.dump(fd, pw, args); + } + } }