Merge "Fix unreadable clock" into qt-dev (c442c8e5) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -53,11 +53,13 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener
	protected WallpaperColors mLockColors;		protected WallpaperColors mLockColors;

	public ColorExtractor(Context context) {		public ColorExtractor(Context context) {
	this(context, new Tonal(context), true /* immediately */);		this(context, new Tonal(context), true /* immediately */,
			context.getSystemService(WallpaperManager.class));
	}		}

	@VisibleForTesting		@VisibleForTesting
	public ColorExtractor(Context context, ExtractionType extractionType, boolean immediately) {		public ColorExtractor(Context context, ExtractionType extractionType, boolean immediately,
			WallpaperManager wallpaperManager) {
	mContext = context;		mContext = context;
	mExtractionType = extractionType;		mExtractionType = extractionType;

	@@ -72,7 +74,6 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener

	mOnColorsChangedListeners = new ArrayList<>();		mOnColorsChangedListeners = new ArrayList<>();

	WallpaperManager wallpaperManager = mContext.getSystemService(WallpaperManager.class);
	if (wallpaperManager == null) {		if (wallpaperManager == null) {
	Log.w(TAG, "Can't listen to color changes!");		Log.w(TAG, "Can't listen to color changes!");
	} else {		} else {
	@@ -110,7 +111,7 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener
	}		}
	}		}

	private void extractWallpaperColors() {		protected void extractWallpaperColors() {
	GradientColors[] systemColors = mGradientColors.get(WallpaperManager.FLAG_SYSTEM);		GradientColors[] systemColors = mGradientColors.get(WallpaperManager.FLAG_SYSTEM);
	GradientColors[] lockColors = mGradientColors.get(WallpaperManager.FLAG_LOCK);		GradientColors[] lockColors = mGradientColors.get(WallpaperManager.FLAG_LOCK);
	extractInto(mSystemColors,		extractInto(mSystemColors,

packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivity.java

+1 −3

packages/SystemUI/res-keyguard/values/styles.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,7 @@
	<item name="android:colorBackground">@*android:color/background_material_dark</item>		<item name="android:colorBackground">@*android:color/background_material_dark</item>
	</style>		</style>

	<style name="TextAppearance.Keyguard" parent="Theme.SystemUI">		<style name="TextAppearance.Keyguard">
	<item name="android:textSize">@dimen/widget_title_font_size</item>		<item name="android:textSize">@dimen/widget_title_font_size</item>
	<item name="android:gravity">center</item>		<item name="android:gravity">center</item>
	<item name="android:ellipsize">end</item>		<item name="android:ellipsize">end</item>

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -374,7 +374,7 @@ public class KeyguardClockSwitch extends RelativeLayout {

	private void updateColors() {		private void updateColors() {
	ColorExtractor.GradientColors colors = mSysuiColorExtractor.getColors(		ColorExtractor.GradientColors colors = mSysuiColorExtractor.getColors(
	WallpaperManager.FLAG_LOCK, true);		WallpaperManager.FLAG_LOCK);
	mSupportsDarkText = colors.supportsDarkText();		mSupportsDarkText = colors.supportsDarkText();
	mColorPalette = colors.getColorPalette();		mColorPalette = colors.getColorPalette();
	if (mClockPlugin != null) {		if (mClockPlugin != null) {

packages/SystemUI/src/com/android/keyguard/clock/AnalogClockController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -130,7 +130,7 @@ public class AnalogClockController implements ClockPlugin {
	setDarkAmount(1f);		setDarkAmount(1f);
	setTextColor(Color.WHITE);		setTextColor(Color.WHITE);
	ColorExtractor.GradientColors colors = mColorExtractor.getColors(		ColorExtractor.GradientColors colors = mColorExtractor.getColors(
	WallpaperManager.FLAG_LOCK, true);		WallpaperManager.FLAG_LOCK);
	setColorPalette(colors.supportsDarkText(), colors.getColorPalette());		setColorPalette(colors.supportsDarkText(), colors.getColorPalette());
	onTimeTick();		onTimeTick();

Original line number	Original line	Diff line number	Diff line
	@@ -323,7 +323,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
	mColorExtractor = Dependency.get(SysuiColorExtractor.class);		mColorExtractor = Dependency.get(SysuiColorExtractor.class);
	mColorExtractor.addOnColorsChangedListener(this);		mColorExtractor.addOnColorsChangedListener(this);
	mUsingDarkText = mColorExtractor.getColors(ColorExtractor.TYPE_DARK,		mUsingDarkText = mColorExtractor.getColors(ColorExtractor.TYPE_DARK,
	WallpaperManager.FLAG_SYSTEM, true).supportsDarkText();		WallpaperManager.FLAG_SYSTEM).supportsDarkText();
	setTheme(mUsingDarkText ? R.style.RecentsTheme_Wallpaper_Light		setTheme(mUsingDarkText ? R.style.RecentsTheme_Wallpaper_Light
	: R.style.RecentsTheme_Wallpaper);		: R.style.RecentsTheme_Wallpaper);

	@@ -394,8 +394,6 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
	@Override		@Override
	public void onColorsChanged(ColorExtractor colorExtractor, int which) {		public void onColorsChanged(ColorExtractor colorExtractor, int which) {
	if ((which & WallpaperManager.FLAG_SYSTEM) != 0) {		if ((which & WallpaperManager.FLAG_SYSTEM) != 0) {
	// Recents doesn't care about the wallpaper being visible or not, it always
	// wants to scrim with wallpaper colors
	ColorExtractor.GradientColors colors = mColorExtractor.getNeutralColors();		ColorExtractor.GradientColors colors = mColorExtractor.getNeutralColors();
	boolean darkText = colors.supportsDarkText();		boolean darkText = colors.supportsDarkText();
	if (darkText != mUsingDarkText) {		if (darkText != mUsingDarkText) {