diff options
3 files changed, 6 insertions, 22 deletions
diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index dc34127496f6..059bda3a2376 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -54,16 +54,4 @@ android:paddingBottom="10dp" android:importantForAccessibility="yes" /> - <TextView - android:id="@+id/header_debug_info" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:fontFamily="sans-serif-condensed" - android:padding="2dp" - android:textColor="#00A040" - android:textSize="11dp" - android:textStyle="bold" - android:visibility="invisible"/> - </com.android.systemui.qs.QuickStatusBarHeader> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 8aadef817eb0..2f9fa9e6ec41 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -68,7 +68,6 @@ import android.view.WindowInsets; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.FrameLayout; -import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintSet; @@ -405,6 +404,7 @@ public class NotificationPanelViewController extends PanelViewController { // Used for two finger gesture as well as accessibility shortcut to QS. private boolean mQsExpandImmediate; private boolean mTwoFingerQsExpandPossible; + private String mHeaderDebugInfo; /** * If we are in a panel collapsing motion, we reset scrollY of our scroll view but still @@ -3423,8 +3423,8 @@ public class NotificationPanelViewController extends PanelViewController { return mView.getHeight(); } - public TextView getHeaderDebugInfo() { - return mView.findViewById(R.id.header_debug_info); + public void setHeaderDebugInfo(String text) { + if (DEBUG) mHeaderDebugInfo = text; } public void onThemeChanged() { @@ -4087,6 +4087,8 @@ public class NotificationPanelViewController extends PanelViewController { p.setStrokeWidth(2); p.setStyle(Paint.Style.STROKE); canvas.drawLine(0, getMaxPanelHeight(), mView.getWidth(), getMaxPanelHeight(), p); + p.setTextSize(24); + if (mHeaderDebugInfo != null) canvas.drawText(mHeaderDebugInfo, 50, 100, p); p.setColor(Color.BLUE); canvas.drawLine(0, getExpandedHeight(), mView.getWidth(), getExpandedHeight(), p); p.setColor(Color.GREEN); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java index 024a0b17b5cc..525f2205f784 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java @@ -29,7 +29,6 @@ import android.service.vr.IVrManager; import android.service.vr.IVrStateCallbacks; import android.util.Log; import android.util.Slog; -import android.view.View; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; @@ -162,11 +161,6 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, mBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); - if (MULTIUSER_DEBUG) { - mNotificationPanelDebugText = mNotificationPanel.getHeaderDebugInfo(); - mNotificationPanelDebugText.setVisibility(View.VISIBLE); - } - IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService( Context.VR_SERVICE)); if (vrManager != null) { @@ -332,7 +326,7 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, // Begin old BaseStatusBar.userSwitched mHeadsUpManager.setUser(newUserId); // End old BaseStatusBar.userSwitched - if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId); + if (MULTIUSER_DEBUG) mNotificationPanel.setHeaderDebugInfo("USER " + newUserId); mCommandQueue.animateCollapsePanels(); if (mReinflateNotificationsOnUserSwitched) { updateNotificationsOnDensityOrFontScaleChanged(); |