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

Commit 4451b6ae authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Add theme variables to SysUI dump" into oc-dr1-dev

parents 4bb2f8e9 8a4522dc

core/java/com/android/internal/colorextraction/ColorExtractor.java

+3 −3
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener 


    private static final String TAG = "ColorExtractor";



    private final SparseArray<GradientColors[]> mGradientColors;

    protected final SparseArray<GradientColors[]> mGradientColors;

    private final ArrayList<WeakReference<OnColorsChangedListener>> mOnColorsChangedListeners;

    private final Context mContext;

    private final ExtractionType mExtractionType;

    private WallpaperColors mSystemColors;

    private WallpaperColors mLockColors;

    protected WallpaperColors mSystemColors;

    protected WallpaperColors mLockColors;



    public ColorExtractor(Context context) {

        this(context, new Tonal(context));

packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java

+22 −1
Original line number Diff line number Diff line
@@ -31,11 +31,16 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.colorextraction.ColorExtractor;

import com.android.internal.colorextraction.types.ExtractionType;

import com.android.internal.colorextraction.types.Tonal;

import com.android.systemui.Dumpable;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Arrays;



/**

 * ColorExtractor aware of wallpaper visibility

 */

public class SysuiColorExtractor extends ColorExtractor {

public class SysuiColorExtractor extends ColorExtractor implements Dumpable {

    private static final String TAG = "SysuiColorExtractor";

    private boolean mWallpaperVisible;

    // Colors to return when the wallpaper isn't visible
@@ -154,4 +159,20 @@ public class SysuiColorExtractor extends ColorExtractor { 
        }

    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("SysuiColorExtractor:");



        pw.println("  Current wallpaper colors:");

        pw.println("    system: " + mSystemColors);

        pw.println("    lock: " + mLockColors);



        GradientColors[] system = mGradientColors.get(WallpaperManager.FLAG_SYSTEM);

        GradientColors[] lock = mGradientColors.get(WallpaperManager.FLAG_LOCK);

        pw.println("  Gradients:");

        pw.println("    system: " + Arrays.toString(system));

        pw.println("    lock: " + Arrays.toString(lock));

        pw.println("  Default scrim: " + mWpHiddenColors);



    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -3509,6 +3509,14 @@ public class StatusBar extends SystemUI implements DemoMode, 
            pw.print  ("      ");

            mStackScroller.dump(fd, pw, args);

        }

        pw.println("  Theme:");

        if (mOverlayManager == null) {

            pw.println("    overlay manager not initialized!");

        } else {

            pw.println("    dark overlay on: " + isUsingDarkTheme());

        }

        final boolean lightWpTheme = mContext.getThemeResId() == R.style.Theme_SystemUI_Light;

        pw.println("    light wallpaper theme: " + lightWpTheme);



        DozeLog.dump(pw);