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

Commit 1c08c8f6 authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Add debug text to NotificationPanelViewController 

This fixes a bug where setting MULTIUSER_DEBUG to true would result in a
NullPointerException. It also deletes an invisible TextView from
quick_status_bar_expanded_header.xml.

Test: Set MULTIUSER_DEBUG to true in StatusBar
Bug: 169783558
Change-Id: I357346449ade9a70ca935fcffaee03f12c7400d6
parent d014bb74

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+0 −12
Original line number Original line Diff line number Diff line
@@ -54,16 +54,4 @@ 
        android:paddingBottom="10dp"

        android:paddingBottom="10dp"

        android:importantForAccessibility="yes" />

        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>
 
</com.android.systemui.qs.QuickStatusBarHeader>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -64,7 +64,6 @@ import android.view.WindowInsets; 
import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.FrameLayout;

import android.widget.FrameLayout;

import android.widget.TextView;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.jank.InteractionJankMonitor;
@@ -396,6 +395,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    // Used for two finger gesture as well as accessibility shortcut to QS.

    // Used for two finger gesture as well as accessibility shortcut to QS.

    private boolean mQsExpandImmediate;

    private boolean mQsExpandImmediate;

    private boolean mTwoFingerQsExpandPossible;

    private boolean mTwoFingerQsExpandPossible;

    private String mHeaderDebugInfo;





    /**

    /**

     * If we are in a panel collapsing motion, we reset scrollY of our scroll view but still

     * If we are in a panel collapsing motion, we reset scrollY of our scroll view but still
@@ -3381,8 +3381,8 @@ public class NotificationPanelViewController extends PanelViewController { 
        return mView.getHeight();

        return mView.getHeight();

    }

    }





    public TextView getHeaderDebugInfo() {

    public void setHeaderDebugInfo(String text) {

        return mView.findViewById(R.id.header_debug_info);

        if (DEBUG) mHeaderDebugInfo = text;

    }

    }





    public void onThemeChanged() {

    public void onThemeChanged() {
@@ -4045,6 +4045,8 @@ public class NotificationPanelViewController extends PanelViewController { 
            p.setStrokeWidth(2);

            p.setStrokeWidth(2);

            p.setStyle(Paint.Style.STROKE);

            p.setStyle(Paint.Style.STROKE);

            canvas.drawLine(0, getMaxPanelHeight(), mView.getWidth(), getMaxPanelHeight(), p);

            canvas.drawLine(0, getMaxPanelHeight(), mView.getWidth(), getMaxPanelHeight(), p);

            p.setTextSize(24);

            if (mHeaderDebugInfo != null) canvas.drawText(mHeaderDebugInfo, 50, 100, p);

            p.setColor(Color.BLUE);

            p.setColor(Color.BLUE);

            canvas.drawLine(0, getExpandedHeight(), mView.getWidth(), getExpandedHeight(), p);

            canvas.drawLine(0, getExpandedHeight(), mView.getWidth(), getExpandedHeight(), p);

            p.setColor(Color.GREEN);

            p.setColor(Color.GREEN);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java

+1 −7
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ import android.service.vr.IVrManager; 
import android.service.vr.IVrStateCallbacks;

import android.service.vr.IVrStateCallbacks;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.view.View;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityManager;

import android.widget.TextView;

import android.widget.TextView;
@@ -162,11 +161,6 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, 
        mBarService = IStatusBarService.Stub.asInterface(

        mBarService = IStatusBarService.Stub.asInterface(

                ServiceManager.getService(Context.STATUS_BAR_SERVICE));

                ServiceManager.getService(Context.STATUS_BAR_SERVICE));





        if (MULTIUSER_DEBUG) {

            mNotificationPanelDebugText = mNotificationPanel.getHeaderDebugInfo();

            mNotificationPanelDebugText.setVisibility(View.VISIBLE);

        }



        IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(

        IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(

                Context.VR_SERVICE));

                Context.VR_SERVICE));

        if (vrManager != null) {

        if (vrManager != null) {
@@ -332,7 +326,7 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, 
        // Begin old BaseStatusBar.userSwitched

        // Begin old BaseStatusBar.userSwitched

        mHeadsUpManager.setUser(newUserId);

        mHeadsUpManager.setUser(newUserId);

        // End old BaseStatusBar.userSwitched

        // End old BaseStatusBar.userSwitched

        if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId);

        if (MULTIUSER_DEBUG) mNotificationPanel.setHeaderDebugInfo("USER " + newUserId);

        mCommandQueue.animateCollapsePanels();

        mCommandQueue.animateCollapsePanels();

        if (mReinflateNotificationsOnUserSwitched) {

        if (mReinflateNotificationsOnUserSwitched) {

            updateNotificationsOnDensityOrFontScaleChanged();

            updateNotificationsOnDensityOrFontScaleChanged();