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

Commit 04350f1f authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Add more info to dump" into tm-dev am: b0b4b466 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245864



Change-Id: I8d0cee3f087b372c1e0bfb79220a872b0f9a99b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f1e8b6b b0b4b466

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+13 −5
Original line number Original line Diff line number Diff line
@@ -957,11 +957,19 @@ public class ScreenDecorations extends CoreStartable implements Tunable , Dumpab 
        } else {

        } else {

            pw.println("  mScreenDecorHwcLayer: null");

            pw.println("  mScreenDecorHwcLayer: null");

        }

        }

        if (mOverlays != null) {

            pw.println("  mOverlays(left,top,right,bottom)=("

            pw.println("  mOverlays(left,top,right,bottom)=("

                + (mOverlays != null && mOverlays[BOUNDS_POSITION_LEFT] != null) + ","

                    + (mOverlays[BOUNDS_POSITION_LEFT] != null) + ","

                + (mOverlays != null && mOverlays[BOUNDS_POSITION_TOP] != null) + ","

                    + (mOverlays[BOUNDS_POSITION_TOP] != null) + ","

                + (mOverlays != null && mOverlays[BOUNDS_POSITION_RIGHT] != null) + ","

                    + (mOverlays[BOUNDS_POSITION_RIGHT] != null) + ","

                + (mOverlays != null && mOverlays[BOUNDS_POSITION_BOTTOM] != null) + ")");

                    + (mOverlays[BOUNDS_POSITION_BOTTOM] != null) + ")");



            for (int i = BOUNDS_POSITION_LEFT; i < BOUNDS_POSITION_LENGTH; i++) {

                if (mOverlays[i] != null) {

                    mOverlays[i].dump(pw, getWindowTitleByPos(i));

                }

            }

        }

        mRoundedCornerResDelegate.dump(pw, args);

        mRoundedCornerResDelegate.dump(pw, args);

    }

    }

packages/SystemUI/src/com/android/systemui/decor/OverlayWindow.kt

+11 −0
Original line number Original line Diff line number Diff line
@@ -16,11 +16,13 @@ 
package com.android.systemui.decor

package com.android.systemui.decor





import android.annotation.IdRes

import android.annotation.IdRes

import android.annotation.NonNull

import android.content.Context

import android.content.Context

import android.view.Surface

import android.view.Surface

import android.view.View

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup

import com.android.systemui.RegionInterceptingFrameLayout

import com.android.systemui.RegionInterceptingFrameLayout

import java.io.PrintWriter





class OverlayWindow(private val context: Context) {

class OverlayWindow(private val context: Context) {
@@ -100,4 +102,13 @@ class OverlayWindow(private val context: Context) { 
            }

            }

        }

        }

    }

    }



    fun dump(@NonNull pw: PrintWriter, name: String) {

        pw.println("  $name=")

        pw.println("    rootView=$rootView")

        for (i in 0 until rootView.childCount) {

            val child = rootView.getChildAt(i)

            pw.println("    child[$i]=$child")

        }

    }

}
 
}
 
 No newline at end of file