Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lucas Dupin
2017-07-27 16:41:12 +00:00
committed by Android (Google) Code Review
parent 4bb2f8e9fb 8a4522dceb
commit 4451b6ae19
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/colorextraction/ColorExtractor.java
View File

@@ -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));

23
packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java
View File

@@ -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);
}
}

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

@@ -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);